diff options
Diffstat (limited to 'ext/standard/tests')
3110 files changed, 15352 insertions, 14321 deletions
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 99b1fc27d7..667c954895 100644 --- a/ext/standard/tests/array/005.phpt +++ b/ext/standard/tests/array/005.phpt @@ -16,7 +16,7 @@ $str = "abc"; /* 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( 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" ), @@ -52,13 +52,13 @@ var_dump( array_shift($empty_array) ); echo "\n*** Testing with various array inputs ***\n"; $counter = 1; -foreach( $mixed_array as $sub_array ) { +foreach( $mixed_array as $sub_array ) { echo "\n-- Input Array for Iteration $counter is -- \n"; print_r( $sub_array ); echo "\nOutput after shift is :\n"; var_dump( array_shift($sub_array) ); $counter++; -} +} /*Checking for internal array pointer beint reset when shift is called */ @@ -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..f275085de5 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -2,7 +2,7 @@ Test key(), current(), next() & reset() functions --FILE-- <?php -/* Prototype & Usage: +/* Prototype & Usage: mixed key ( array &$array ) -> returns the index element of the current array position mixed current ( array &$array ) -> returns the current element in the array mixed next ( array &$array ) -> similar to current() but advances the internal pointer to next element @@ -19,16 +19,16 @@ $basic_arrays = array ( array('d' => 'drink', 'p' => 'port', 's' => 'set'), // another associative array array(1 => 'One', 2 => 'two', 3 => "three") // associative array with key as integers ); - + $varient_arrays = array ( array(), // empty array array(""), // array with null string - array(NULL),// array with NULL + array(NULL),// array with NULL array(null),// array with null array(NULL, true, null, "", 1), // mixed array - array(-1.5 => "test", -2 => "rest", 2.5 => "two", + array(-1.5 => "test", -2 => "rest", 2.5 => "two", "" => "string", 0 => "zero", "" => "" ) // mixed array -); +); echo "*** Testing basic operations ***\n"; $loop_count = 1; @@ -69,7 +69,7 @@ foreach ($varient_arrays as $sub_array ) { echo "\n"; } -/*test these functions on array which is already unset */ +/*test these functions on array which is already unset */ echo "\n-- Testing variation: when array is unset --\n"; $unset_array = array (1); unset($unset_array); @@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) ); var_dump( reset($temp_array, $temp_array) ); var_dump( next($temp_array, $temp_array) ); -// invalid args type, valid argument: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; @@ -116,7 +116,7 @@ var_dump( reset($string) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic operations *** -- Iteration 1 -- int(0) @@ -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..1ce78d51fe 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -3,10 +3,10 @@ Test array_change_key_case() function --FILE-- <?php /* Prototype: array array_change_key_case ( array $input [, int $case] ) - Description: Changes the keys in the input array to be all lowercase - or uppercase. The change depends on the last optional case parameter. + Description: Changes the keys in the input array to be all lowercase + or uppercase. The change depends on the last optional case parameter. You can pass two constants there, CASE_UPPER and CASE_LOWER(default). - The function will leave number indices as is. + The function will leave number indices as is. */ $arrays = array ( array (), @@ -30,7 +30,7 @@ $arrays = array ( array ("ONE" => 1, "TWO" => 2), array ("OnE" => 1, "TWO" => 2), array ("oNe" => 1, "TWO" => 2), - array ("one" => 1, "TwO" => 2), + array ("one" => 1, "TwO" => 2), array ("ONE" => 1, "TwO" => 2), array ("OnE" => 1, "TwO" => 2), array ("oNe" => 1, "TwO" => 2), @@ -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..5c2d524f9b 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -6,22 +6,22 @@ Test array_change_key_case() function - 2 $item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four"); /* use 'case' argument other than CASE_LOWER & CASE_UPPER */ -var_dump(array_change_key_case($item, "CASE_UPPER")); -var_dump(array_change_key_case($item, 5)); +var_dump(array_change_key_case($item, "CASE_UPPER")); +var_dump(array_change_key_case($item, 5)); /* when keys are different in terms of only case */ /* should return one value key pair with key being in lowercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); /* should return one value key pair with key being in uppercase */ -var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); -var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); +var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); +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 8a7c805390..ef4ce85256 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 */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -100,22 +100,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 -- @@ -155,22 +155,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 cd1bff844d..818c20e2ee 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 */ @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -240,32 +240,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 a82b14ec17..025e8f5d61 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 */ @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,7 +49,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -63,7 +63,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', @@ -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 3bd3035c63..022cee099d 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 */ @@ -23,7 +23,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 9caac063b6..b58e78317f 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 */ @@ -26,7 +26,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 bf61248f3f..c4aaa0bde4 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 */ @@ -26,7 +26,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 2b7926d28a..b7539c63a6 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 */ @@ -29,7 +29,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 7bd5a8dead..423310d7ab 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Retuns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -36,7 +36,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_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt index 6d8b74545e..2560332bf5 100644 --- a/ext/standard/tests/array/array_chunk2.phpt +++ b/ext/standard/tests/array/array_chunk2.phpt @@ -6,11 +6,11 @@ $input_array = array('a', 'b', 'c', 'd', 'e'); var_dump(array_chunk($input_array, 0)); var_dump(array_chunk($input_array, 0, true)); var_dump(array_chunk($input_array, 1)); -var_dump(array_chunk($input_array, 1, true)); +var_dump(array_chunk($input_array, 1, true)); var_dump(array_chunk($input_array, 2)); -var_dump(array_chunk($input_array, 2, true)); +var_dump(array_chunk($input_array, 2, true)); var_dump(array_chunk($input_array, 10)); -var_dump(array_chunk($input_array, 10, true)); +var_dump(array_chunk($input_array, 10, true)); ?> --EXPECTF-- Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index c16d2988e3..44c9b5ffaa 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -20,26 +20,26 @@ $input_arrays = array ( // associative arrays - key as string array('key1' => 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), - // array containing elements with/witout keys + // array containing elements with/witout keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size) ); $count++; } 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..6e622df070 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : basic functionality - 'preserve_keys' as true/false +Test array_chunk() function : basic functionality - 'preserve_keys' as true/false --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) @@ -20,18 +20,18 @@ $input_arrays = array( // associative arrays - key as string array('key1' => 1, "key2" => 2, "key3" => 3), - + // associative arrays - key as numeric array(1 => 'one', 2 => "two", 3 => "three"), // array containing elements with/without keys array(1 => 'one','two', 3 => 'three', 4, "five" => 5) -); +); $count = 1; // loop through each element of the array for input -foreach ($input_arrays as $input_array){ - echo "\n-- Iteration $count --\n"; +foreach ($input_arrays as $input_array){ + echo "\n-- Iteration $count --\n"; var_dump( array_chunk($input_array, $size, true) ); var_dump( array_chunk($input_array, $size, false) ); $count++; @@ -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_error.phpt b/ext/standard/tests/array/array_chunk_error.phpt index d2cbbe16e3..5197945994 100644 --- a/ext/standard/tests/array/array_chunk_error.phpt +++ b/ext/standard/tests/array/array_chunk_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_chunk() function : error conditions +Test array_chunk() function : error conditions --FILE-- <?php /* Prototype : array array_chunk(array input, int size [, bool preserve_keys]) - * Description: Split array into chunks + * Description: Split array into chunks * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt index cc53bd5654..8c0a2cccf5 100644 --- a/ext/standard/tests/array/array_chunk_variation1.phpt +++ b/ext/standard/tests/array/array_chunk_variation1.phpt @@ -1,20 +1,20 @@ --TEST-- -Test array_chunk() function : usage variations - unexpected values for 'array' argument +Test array_chunk() function : usage variations - unexpected values for 'array' argument --FILE-- <?php /* Prototype : proto array array_chunk(array $array, int $size [, bool $preserve_keys]) * Description: Split array into chunks - * Chunks an array into size large chunks. + * Chunks an array into size large chunks. * Source code: ext/standard/array.c */ /* -* Testing array_chunk() function with unexpected values for 'array' argument +* Testing array_chunk() function with unexpected values for 'array' argument */ echo "*** Testing array_chunk() : usage variations ***\n"; -// Initialise function arguments +// Initialise function arguments $size = 10; //get an unset variable @@ -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 -- diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt index 738249eae1..b36c194a87 100644 --- a/ext/standard/tests/array/array_chunk_variation2.phpt +++ b/ext/standard/tests/array/array_chunk_variation2.phpt @@ -1,17 +1,17 @@ --TEST-- -Test array_chunk() function : usage variations - unexpected values for 'size' argument +Test array_chunk() function : usage variations - unexpected values for 'size' argument --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) - * Description: Split array into chunks + * Description: Split array into chunks : Chunks an array into size large chunks * Source code: ext/standard/array.c */ /* -* Testing array_chunk() function with unexpected values for 'size' argument +* Testing array_chunk() function with unexpected values for 'size' argument */ echo "*** Testing array_chunk() : usage variations ***\n"; @@ -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() 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 23 -- -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 Done diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt index 542172cab6..26eefc3507 100644 --- a/ext/standard/tests/array/array_chunk_variation3.phpt +++ b/ext/standard/tests/array/array_chunk_variation3.phpt @@ -1,14 +1,14 @@ --TEST-- -Test array_chunk() function : usage variations - unexpected values for 'preserve_keys' +Test array_chunk() function : usage variations - unexpected values for 'preserve_keys' --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) - * Description: Split array into chunks + * Description: Split array into chunks * Source code: ext/standard/array.c */ /* -* Testing array_chunk() function with unexpected values for 'preserve_keys' +* Testing array_chunk() function with unexpected values for 'preserve_keys' */ echo "*** Testing array_chunk() : usage variations ***\n"; @@ -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..b5d0818327 100644 --- a/ext/standard/tests/array/array_chunk_variation4.phpt +++ b/ext/standard/tests/array/array_chunk_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - array with diff. sub arrays +Test array_chunk() function : usage variations - array with diff. sub arrays --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) @@ -18,23 +18,23 @@ $size = 2; // input array $input_array = array ( - "array1" => array(), - "array2" => array(1, 2, 3), - "array3" => array(1) + "array1" => array(), + "array2" => array(1, 2, 3), + "array3" => array(1) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; var_dump( array_chunk($input_array, $size) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; var_dump( array_chunk($input_array, $size, true) ); -echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; +echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; 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_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt index 50050892e7..8d36092822 100644 --- a/ext/standard/tests/array/array_chunk_variation5.phpt +++ b/ext/standard/tests/array/array_chunk_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - different 'size' values +Test array_chunk() function : usage variations - different 'size' values --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt index ae81301fce..0f66fc19f5 100644 --- a/ext/standard/tests/array/array_chunk_variation6.phpt +++ b/ext/standard/tests/array/array_chunk_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - different arrays +Test array_chunk() function : usage variations - different arrays --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) @@ -9,10 +9,10 @@ Test array_chunk() function : usage variations - different arrays */ /* - * Testing array_chunk() function with following conditions + * Testing array_chunk() function with following conditions * 1. array without elements * 2. associative array with duplicate keys - * 3. array with one element + * 3. array with one element */ echo "*** Testing array_chunk() : usage variations ***\n"; @@ -25,7 +25,7 @@ $input_arrays = array ( // array with one element "array2" => array(1), - + // associative array with duplicate keys "array3" => array("a" => 1, "b" => 2, "c" => 3, "a" => 4, "d" => 5) @@ -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..0d5ccb7e6d 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_chunk() function : usage variations - references +Test array_chunk() function : usage variations - references --FILE-- <?php /* Prototype : array array_chunk(array $array, int $size [, bool $preserve_keys]) @@ -9,7 +9,7 @@ Test array_chunk() function : usage variations - references */ /* - * Testing array_chunk() function with following conditions + * Testing array_chunk() function with following conditions * 1. input array containing references */ @@ -21,9 +21,9 @@ echo "\n-- Testing array_chunk(), input array containing references \n"; $numbers=array(1, 2, 3, 4); // reference array -$input_array = array ( - "one" => &$numbers[0], - "two" => &$numbers[1], +$input_array = array ( + "one" => &$numbers[0], + "two" => &$numbers[1], "three" => &$numbers[2], "four" => &$numbers[3] ); @@ -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..40fb677234 100644 --- a/ext/standard/tests/array/array_combine_basic.phpt +++ b/ext/standard/tests/array/array_combine_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test array_combine() function : basic functionality +Test array_combine() function : basic functionality --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) - * Description: Creates an array by using the elements of the first parameter as keys - * and the elements of the second as the corresponding values + * Description: Creates an array by using the elements of the first parameter as keys + * and the elements of the second as the corresponding values * Source code: ext/standard/array.c */ @@ -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_error1.phpt b/ext/standard/tests/array/array_combine_error1.phpt index efb4e68cf6..aa5a1afe1b 100644 --- a/ext/standard/tests/array/array_combine_error1.phpt +++ b/ext/standard/tests/array/array_combine_error1.phpt @@ -1,10 +1,10 @@ --TEST-- -Test array_combine() function : error conditions +Test array_combine() function : error conditions --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) - * Description: Creates an array by using the elements of the first parameter as keys - * and the elements of the second as the corresponding values + * Description: Creates an array by using the elements of the first parameter as keys + * and the elements of the second as the corresponding values * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_combine_error2.phpt b/ext/standard/tests/array/array_combine_error2.phpt index 2d820a0d21..4224f1c8eb 100644 --- a/ext/standard/tests/array/array_combine_error2.phpt +++ b/ext/standard/tests/array/array_combine_error2.phpt @@ -3,8 +3,8 @@ Test array_combine() function : error conditions - empty array --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) - * Description: Creates an array by using the elements of the first parameter as keys - * and the elements of the second as the corresponding values + * Description: Creates an array by using the elements of the first parameter as keys + * and the elements of the second as the corresponding values * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt index 0240af2dce..afb16971fe 100644 --- a/ext/standard/tests/array/array_combine_variation1.phpt +++ b/ext/standard/tests/array/array_combine_variation1.phpt @@ -3,8 +3,8 @@ Test array_combine() function : usage variations - unexpected values for 'keys' --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) - * Description: Creates an array by using the elements of the first parameter as keys - * and the elements of the second as the corresponding values + * Description: Creates an array by using the elements of the first parameter as keys + * and the elements of the second as the corresponding values * Source code: ext/standard/array.c */ @@ -16,7 +16,7 @@ Test array_combine() function : usage variations - unexpected values for 'keys' echo "*** Testing array_combine() : Passing non-array values to \$keys argument ***\n"; -// Initialise $values argument +// Initialise $values argument $values = array(1, 2); //get an unset variable @@ -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..9c350c8aa3 100644 --- a/ext/standard/tests/array/array_combine_variation2.phpt +++ b/ext/standard/tests/array/array_combine_variation2.phpt @@ -3,8 +3,8 @@ Test array_combine() function : usage variations - unexpected values for 'values --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) - * Description: Creates an array by using the elements of the first parameter as keys - * and the elements of the second as the corresponding values + * Description: Creates an array by using the elements of the first parameter as keys + * and the elements of the second as the corresponding values * Source code: ext/standard/array.c */ @@ -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..5d03ffe068 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -9,7 +9,7 @@ Test array_combine() function : usage variations - different arrays(Bug#43424) */ /* -* Passing different types of arrays to both $keys and $values arguments and testing whether +* Passing different types of arrays to both $keys and $values arguments and testing whether * array_combine() behaves in an expected way with the arguments passed to the function */ @@ -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_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt index dd3187a1f0..bcd8428cee 100644 --- a/ext/standard/tests/array/array_combine_variation4.phpt +++ b/ext/standard/tests/array/array_combine_variation4.phpt @@ -10,7 +10,7 @@ Test array_combine() function : usage variations - associative array with differ /* * Testing the functionality of array_combine() by passing different - * associative arrays having different possible keys to $keys argument and + * associative arrays having different possible keys to $keys argument and * associative arrays having different possible keys to $values argument. */ @@ -70,7 +70,7 @@ $arrays = array ( // array to be passsed to $arr2 argument $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, new classA() => 11, 133 => "int"); // loop through each sub-array within $arrays to check the behavior of array_combine() diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt index db5c90df34..4d9f185786 100644 --- a/ext/standard/tests/array/array_combine_variation5.phpt +++ b/ext/standard/tests/array/array_combine_variation5.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt index 5bd3652a4e..654ba0f16a 100644 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ b/ext/standard/tests/array/array_combine_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_combine() function : usage variations - binary safe checking +Test array_combine() function : usage variations - binary safe checking --FILE-- <?php /* Prototype : array array_combine(array $keys, array $values) @@ -9,8 +9,8 @@ Test array_combine() function : usage variations - binary safe checking */ /* -* Testing the behavior of array_combine() by passing array with -* binary values for $keys and $values argument. +* Testing the behavior of array_combine() by passing array with +* binary values for $keys and $values argument. */ echo "*** Testing array_combine() : binary safe checking ***\n"; @@ -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..6ec907856c 100644 --- a/ext/standard/tests/array/array_count_values2.phpt +++ b/ext/standard/tests/array/array_count_values2.phpt @@ -2,27 +2,27 @@ basic array_count_values test --FILE-- <?php -$array1 = array(1, - "hello", - 1, - "world", - "hello", - "", - "rabbit", - "foo", - "Foo", - TRUE, - FALSE, - NULL, +$array1 = array(1, + "hello", + 1, + "world", + "hello", + "", + "rabbit", + "foo", + "Foo", + TRUE, + FALSE, + NULL, 0); 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 5578693beb..e544c8117c 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_count_values() function : Invalid parameters +Test array_count_values() function : Invalid parameters --FILE-- <?php /* Prototype : proto array array_count_values(array input) - * Description: Return the value as key and the frequency of that value in input as value + * Description: Return the value as key and the frequency of that value in input as value * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* @@ -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
\ No newline at end of file diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 1fb36f79e0..9a2830b918 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_count_values() function : Test all normal parameter variations +Test array_count_values() function : Test all normal parameter variations --FILE-- <?php /* Prototype : proto array array_count_values(array input) - * Description: Return the value as key and the frequency of that value in input as value + * Description: Return the value as key and the frequency of that value in input as value * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* @@ -37,7 +37,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.phpt b/ext/standard/tests/array/array_diff_assoc.phpt index 509c632ba5..29db107d65 100644 --- a/ext/standard/tests/array/array_diff_assoc.phpt +++ b/ext/standard/tests/array/array_diff_assoc.phpt @@ -1,6 +1,6 @@ --TEST-- basic array_diff_assoc test ---FILE-- +--FILE-- <?php $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red", ""); $array2 = array("a" => "green", "yellow", "red", TRUE); diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt index ecf0c7079e..919bd9b3ad 100644 --- a/ext/standard/tests/array/array_diff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt @@ -3,8 +3,8 @@ Test array_diff_assoc() function : basic functionality --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments but do additional checks whether the keys are equal + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments but do additional checks whether the keys are equal * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt index e3513a9346..211907c726 100644 --- a/ext/standard/tests/array/array_diff_assoc_error.phpt +++ b/ext/standard/tests/array/array_diff_assoc_error.phpt @@ -3,8 +3,8 @@ Test array_diff_assoc() function : error conditions - pass array_diff_assoc() to --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal + * Description: Returns the entries of arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 92f86a608a..10b012414c 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -3,15 +3,15 @@ Test array_diff_assoc() function : usage variations - unexpected values for 'ar --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal - * Source code: ext/standard/array.c + * Description: Returns the entries of $arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal + * Source code: ext/standard/array.c */ /* * Pass array_diff_assoc arguments that are not arrays in place of $arr1 */ - + echo "*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -36,7 +36,7 @@ EOT; // get a resource variable $fp = fopen(__FILE__, "r"); -//array of unexpected values to be passed to $arr1 argument +//array of unexpected values to be passed to $arr1 argument $inputs = array( // int data @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), @@ -104,131 +104,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
\ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index c2f052e83a..5e4460cd2a 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt @@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - binary safe check --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not - * present in any of the others arguments but do additional checks whether - * the keys are equal + * Description: Returns the entries of arr1 that have values which are not + * present in any of the others arguments but do additional checks whether + * the keys are equal * Source code: ext/standard/array.c */ @@ -15,15 +15,15 @@ Test array_diff_assoc() function : usage variations - binary safe check echo "*** Testing array_diff_assoc() : usage variations ***\n"; -$array1 = array( b"1", - b"hello", - "world", - "str1" => "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff_assoc($array1, $array2)); @@ -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 0ea6480b9e..b625819c01 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - unexpected values for 'ar --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal - * Source code: ext/standard/array.c + * Description: Returns the entries of arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal + * Source code: ext/standard/array.c */ /* @@ -36,7 +36,7 @@ EOT; // get a resource variable $fp = fopen(__FILE__, "r"); -//array of unexpected values to be passed to $arr1 argument +//array of unexpected values to be passed to $arr1 argument $inputs = array( // int data @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), @@ -105,131 +105,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
\ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 36d31b078b..1d4aaf2e43 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt @@ -3,15 +3,15 @@ Test array_diff_assoc() function : variation - array containing different data t --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal - * Source code: ext/standard/array.c + * Description: Returns the entries of arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal + * Source code: ext/standard/array.c */ /* * Test how array_diff_assoc() compares indexed arrays containing different data types */ - + echo "\n*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -33,12 +33,12 @@ $heredoc = <<<EOT hello world EOT; -//array of different data types to be passed to $arr1 argument +//array of different data types to be passed to $arr1 argument $inputs = array( // int data /*1*/ -'int' => array( +'int' => array( 0, 1, 12345, @@ -46,7 +46,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5, -10.5, 12.3456789000e10, @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE), - + // empty data /*5*/ 'empty' => array( @@ -79,13 +79,13 @@ $inputs = array( "string", 'string', $heredoc), - + // binary data /*7*/ 'binary' => array( b"binary", (binary)"binary"), - + // object data /*8*/ 'object' => array( diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index cd1aafedef..c93f9c1d0f 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -4,16 +4,16 @@ Test array_diff_assoc() function : usage variations - arrays with different data <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal - * Source code: ext/standard/array.c + * Description: Returns the entries of arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal + * Source code: ext/standard/array.c */ /* * Test how array_diff_assoc() compares arrays containing different data types * as keys */ - + echo "\n*** Testing array_diff_assoc() : usage variations ***\n"; $array = array(1, 2, 3); @@ -32,7 +32,7 @@ $inputs = array( // int data /*1*/ -'int' => array( +'int' => array( 0 => 'zero', 1 => 'one', 12345 => 'positive', @@ -40,7 +40,7 @@ $inputs = array( // float data /*2*/ -'float' => array( +'float' => array( 10.5 => 'float 1', -10.5 => 'float 2', .5 => 'float 3'), @@ -58,7 +58,7 @@ $inputs = array( false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'), - + // empty data /*5*/ 'empty' => array( @@ -71,7 +71,7 @@ $inputs = array( "string" => 'stringd', 'string' => 'strings', $heredoc => 'stringh'), - + // binary data /*7*/ 'binary' => array( @@ -101,7 +101,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index c949191c1f..ddaebb85ef 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -3,8 +3,8 @@ Test array_diff_assoc() function : usage variations - compare integers, floats a --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are not present - * in any of the others arguments but do additional checks whether the keys are equal + * Description: Returns the entries of arr1 that have values which are not present + * in any of the others arguments but do additional checks whether the keys are equal * Source code: ext/standard/array.c */ @@ -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: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index 5c3f617c47..e04d80724b 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -3,65 +3,65 @@ Test array_diff_assoc() function : usage variations - strict string comparison c --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments but do additional checks whether the keys are equal + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments but do additional checks whether the keys are equal * Source code: ext/standard/array.c */ /* * Test how array_diff_assoc behaves - * 1. When comparing an array that has similar elements + * 1. When comparing an array that has similar elements * but has been created in a different order * 2. When doing a strict comparison of string representation */ echo "*** Testing array_diff_assoc() : usage variations ***\n"; -$array = array ('zero', - 1 => 1, +$array = array ('zero', + 1 => 1, 'two' => 2.00000000000001); - + $inputs = array ( //default keys => string values /*1*/ array('2.00000000000001', '1', 'zero', 'a'), - + //numeric keys => string values -/*2*/ array(2 => '2.00000000000001', - 1 => '1', - 0 => 'zero', +/*2*/ array(2 => '2.00000000000001', + 1 => '1', + 0 => 'zero', 3 => 'a'), //string keys => string values -/*3*/ array('2' => '2.00000000000001', - '1' => '1', - '0' => 'zero', +/*3*/ array('2' => '2.00000000000001', + '1' => '1', + '0' => 'zero', '3' => 'a') , - + //default keys => numeric values /*4*/ array(2, 1, 0), - + //numeric keys => numeric values /*5*/ array(2 => 2, 1 => 1, 0 => 0), - + //string keys => numeric values -/*6*/ array('two' => 2, - '1' => 1, +/*6*/ array('two' => 2, + '1' => 1, '0' => 0), - + //defualt keys => float values /*7*/ array(2.00000000000001, 1.00, 0.01E-9), - + //numeric keys => float values /*8*/ array(2 => 2.00000000000001, 1 => 1.00, 0 => 0.01E-9), - + //string keys => float values -/*9*/ array ('two' => 2.00000000000001, - '1' => 1.00, +/*9*/ array ('two' => 2.00000000000001, + '1' => 1.00, '0' =>0.01E-9) ); @@ -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 a2de41bc08..eeb881f629 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -4,8 +4,8 @@ Test array_diff_assoc() function : usage variations - arrays containing referenc <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments but do additional checks whether the keys are equal + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments but do additional checks whether the keys are equal * Source code: ext/standard/array.c */ @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Results when $a = a: -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 0acab2a20e..54680957ab 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt @@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - array containing duplicate --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments but do additional checks whether - * the keys are equal + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments but do additional checks whether + * the keys are equal * Source code: ext/standard/array.c */ @@ -21,8 +21,8 @@ echo "*** Testing array_diff_assoc() : variation ***\n"; $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '0' => 'a', + 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer var_dump(array_diff_assoc($array_index, $array_assoc)); @@ -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 56e0a0bd43..bc3e5417cc 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -3,14 +3,14 @@ Test array_diff_assoc() function : usage variations - compare multidimensional a --FILE-- <?php /* Prototype : array array_diff_assoc(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments but do additional checks whether - * the keys are equal + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments but do additional checks whether + * the keys are equal * Source code: ext/standard/array.c */ /* - * Test how array_diff_assoc behaves when comparing + * Test how array_diff_assoc behaves when comparing * multi-dimensional arrays */ @@ -24,7 +24,7 @@ $array2 = array('sub_arraya' => array (1, 3, 5), echo "-- Compare two 2-D arrays --\n"; var_dump(array_diff_assoc($array1, $array2)); var_dump(array_diff_assoc($array2, $array1)); - + echo "\n-- Compare subarrays from two 2-D arrays --\n"; var_dump(array_diff_assoc($array1['sub_array1'], $array2['sub_arraya'])); var_dump(array_diff_assoc($array2['sub_arraya'], $array1['sub_array1'])); @@ -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..4ef78f88f9 100644 --- a/ext/standard/tests/array/array_diff_basic.phpt +++ b/ext/standard/tests/array/array_diff_basic.phpt @@ -3,8 +3,8 @@ Test array_diff() function : basic functionality --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not present - * in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not present + * in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_diff_error.phpt index 67c1b6fcc4..019cffb1ef 100644 --- a/ext/standard/tests/array/array_diff_error.phpt +++ b/ext/standard/tests/array/array_diff_error.phpt @@ -3,13 +3,13 @@ Test array_diff() function : error conditions - too few arguments passed to func --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are - * not present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are + * not present in any of the others arguments. * Source code: ext/standard/array.c */ /* - * Test array_diff with less than the expected number of arguments + * Test array_diff with less than the expected number of arguments */ echo "*** Testing array_diff() : error conditions ***\n"; 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_basic.phpt b/ext/standard/tests/array/array_diff_key_basic.phpt index 40d02d4785..6f6fcb9a4d 100644 --- a/ext/standard/tests/array/array_diff_key_basic.phpt +++ b/ext/standard/tests/array/array_diff_key_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_diff_key() : basic functionality +Test array_diff_key() : basic functionality --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt index 05d5cf3c27..90168f5de6 100644 --- a/ext/standard/tests/array/array_diff_key_error.phpt +++ b/ext/standard/tests/array/array_diff_key_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_diff_key() function : error conditions +Test array_diff_key() function : error conditions --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index ef9414c1b3..689cbd6ae2 100644 --- a/ext/standard/tests/array/array_diff_key_variation1.phpt +++ b/ext/standard/tests/array/array_diff_key_variation1.phpt @@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt index af4738db68..e404fe680d 100644 --- a/ext/standard/tests/array/array_diff_key_variation2.phpt +++ b/ext/standard/tests/array/array_diff_key_variation2.phpt @@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt index a710b3bd06..029792d12b 100644 --- a/ext/standard/tests/array/array_diff_key_variation3.phpt +++ b/ext/standard/tests/array/array_diff_key_variation3.phpt @@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index d72e70ba5f..4201becefd 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing integer indexed array --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(-07 => '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), @@ -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 72dca96826..ff8f3aff4b 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -3,15 +3,15 @@ Test array_diff_key() function : usage variation - Passing float indexed array --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; // loop through each element of the array for arr1 @@ -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 b98b5b54e8..8670d05257 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing boolean indexed array --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with boolean indexed array --\n"; @@ -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 53807cb115..d3acf8c88c 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing null,unset and undefi --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -27,10 +27,10 @@ foreach($input_arrays as $key =>$value) { // loop through each element of the array for arr1 var_dump( array_diff_key($input_array, $value) ); var_dump( array_diff_key($value, $input_array) ); -} +} ?> ===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 25b445d00a..7134b4e52d 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_diff_key() function : usage variation - Passing multi-dimensional array +Test array_diff_key() function : usage variation - Passing multi-dimensional array --FILE-- <?php /* Prototype : array array_diff_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -13,19 +13,19 @@ echo "*** Testing array_diff_key() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); echo "\n-- Testing array_diff_key() function with multi dimensional array --\n"; @@ -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_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt index 419b916fd8..6a96be6b7c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_diff_uassoc(): Basic test +array_diff_uassoc(): Basic test --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt index d90c80f20b..0f9f82464c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_diff_uassoc() function : error conditions +Test array_diff_uassoc() function : error conditions --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index 95da2ecb3c..2e035cc8b2 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing unexpected values --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..db0476ae34 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing float indexed arra --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -11,16 +11,16 @@ Test array_diff_uassoc() function : usage variation - Passing float indexed arra echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $float_indx_array, "strcasecmp") ); 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..f2e945840f 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -11,16 +11,16 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_diff_key() function with float indexed array --\n"; var_dump( array_diff_uassoc($input_array, $boolean_indx_array, "strcasecmp") ); 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..656faf4793 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => ''); +$input_array = array(10 => '10', "" => ''); //get an unset variable $unset_var = 10; @@ -27,11 +27,11 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===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..4094218697 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variations - arrays containing referen --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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_variation14.phpt b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt index f8fc5a4b4b..a98a2800da 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing classWithoutToStrin --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt index 073602c48a..c756e48d11 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values t --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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_variation3.phpt b/ext/standard/tests/array/array_diff_uassoc_variation3.phpt index 6f413f623e..3218dd3b6c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation3.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values t --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt index 0943a42e6a..0c530739f6 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values a --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..dde0b1ea07 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing integers and flo --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..998cc33f42 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing floating points --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..cbc1d8305c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing strings containi --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..40062170c4 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing integers with st --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -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..cb4672773d 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing integer indexed ar --FILE-- <?php /* Prototype : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Computes the difference of arrays with additional index check which is performed by a + * Description: Computes the difference of arrays with additional index check which is performed by a * user supplied callback function * Source code: ext/standard/array.c */ @@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing integer indexed ar echo "*** Testing array_diff_uassoc() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => 10, 12 => 12); +$input_array = array(10 => 10, 12 => 12); $input_arrays = array( 'decimal indexed' => array(10 => 10, -17 => -17), @@ -23,11 +23,11 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") ); var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") ); -} - +} + ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_basic.phpt b/ext/standard/tests/array/array_diff_ukey_basic.phpt index 3dde1646af..7ac309a01e 100644 --- a/ext/standard/tests/array/array_diff_ukey_basic.phpt +++ b/ext/standard/tests/array/array_diff_ukey_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_diff_ukey() : Basic test. +array_diff_ukey() : Basic test. --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_diff_ukey_error.phpt b/ext/standard/tests/array/array_diff_ukey_error.phpt index 92b6ce0f2c..1a73bdfd5f 100644 --- a/ext/standard/tests/array/array_diff_ukey_error.phpt +++ b/ext/standard/tests/array/array_diff_ukey_error.phpt @@ -1,15 +1,15 @@ --TEST-- -Test array_diff_ukey() function : error conditions +Test array_diff_ukey() function : error conditions --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_ukey() : error conditions ***\n"; -// Initialize +// Initialize $array1 = array('blue' => 1, 'red' => 2, 'green' => 3, 'purple' => 4); $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8); $extra_arg = 10; diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt index e2234595ad..386447c5f0 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt index 09b4a70237..58a040b0a7 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing non-existing functio --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation11.phpt b/ext/standard/tests/array/array_diff_ukey_variation11.phpt index 074be3bae8..0ad3fbac5e 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation11.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation11.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing class without string --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt index 6831ba12a7..8a825d361e 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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..a1f1897208 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation3.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation3.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -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_variation4.phpt b/ext/standard/tests/array/array_diff_ukey_variation4.phpt index b34083308e..a0399c2fa4 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation4.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation4.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index 8f96ad6f40..eae2cbb915 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing multi-dimensional ar --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. * Source code: ext/standard/array.c */ @@ -13,19 +13,19 @@ echo "*** Testing array_diff_ukey() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 => 'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); echo "\n-- Testing array_diff_ukey() function with multi dimensional array --\n"; @@ -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..ab94239696 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing integer indexed arra --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(-07 => '-07', 0xA => '0xA'); +$input_array = array(-07 => '-07', 0xA => '0xA'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), @@ -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..d499fe73c1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -3,15 +3,15 @@ Test array_diff_ukey() function : usage variation - Passing float indexed array --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); +$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); function key_compare_func($key1, $key2) { @@ -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..c3dbdc1376 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing boolean indexed arra --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); +$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); function key_compare_func($key1, $key2) @@ -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..c211bfe88b 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing null,unset and undef --FILE-- <?php /* Prototype : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. + * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_diff_ukey() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(10 => '10', "" => 'empty'); +$input_array = array(10 => '10', "" => 'empty'); //get an unset variable $unset_var = 10; @@ -26,11 +26,11 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_diff_ukey($value, $input_array, 'strcasecmp') ); var_dump( array_diff_ukey($input_array, $value, 'strcasecmp') ); -} +} ?> ===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 06cb3d6981..bfe7ac439e 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr1' arg --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,11 +70,11 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", - + // object data /*23*/ new classA(), @@ -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
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index f93a1f5353..ec748c2884 100644 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ b/ext/standard/tests/array/array_diff_variation10.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - binary safe checking --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are - * not present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are + * not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -15,15 +15,15 @@ Test array_diff() function : usage variations - binary safe checking echo "*** Testing array_diff() : usage variations ***\n"; -$array1 = array( b"1", - b"hello", - "world", - "str1" => "hello", +$array1 = array( b"1", + b"hello", + "world", + "str1" => "hello", "str2" => "world"); $array2 = array( b"1" => 'hello', b"world", - "hello", + "hello", 'test'); var_dump(array_diff($array1, $array2)); @@ -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 70bfc05fc0..7f3f36c9e6 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr2' arg --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are - * not present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are + * not present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // binary data /*21*/ b"binary", (binary)"binary", @@ -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
\ No newline at end of file diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 4d02598717..5888c3b1ba 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - array with different data types --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -50,7 +50,7 @@ $values = array( .5), /*4*/ -"null" => array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); @@ -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 cb0dcc315a..01fb1a43ef 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - array with different data types --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -50,7 +50,7 @@ $values = array( .5), /*4*/ -"null" => array( +"null" => array( // null data NULL, null), @@ -64,7 +64,7 @@ $values = array( FALSE), /*6*/ -"empty" => array( +"empty" => array( // empty data "", ''), @@ -75,20 +75,20 @@ $values = array( "string", 'string', $heredoc), - -/*8*/ + +/*8*/ "binary" => array( // binary data b"binary", (binary)"binary"), - -/*9*/ + +/*9*/ "undefined" => array( // undefined data @$undefined_var), /*10*/ -"unset" => array( +"unset" => array( // unset data @$unset_var) ); @@ -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 d9e97f5606..71667f67fa 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_diff() function : usage variations - comparing integers, float +Test array_diff() function : usage variations - comparing integers, float and string array values --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -18,7 +18,7 @@ echo "*** Testing array_diff() : usage variations ***\n"; $arr_int = array(1, 2, 3); $arr_float = array(1.00, 2.00, 3.00); $arr_int_str = array('1', '2', '3'); -$arr_float_str = array('1.00', '2.00', '3.00'); +$arr_float_str = array('1.00', '2.00', '3.00'); print "-- Compare integers and floats: --\n"; var_dump(array_diff($arr_int, $arr_float)); @@ -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 23aeff6332..9a71db570c 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - array containing duplicate keys --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -20,8 +20,8 @@ echo "*** Testing array_diff() : usage variations ***\n"; $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), duplicate value (b) $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', - '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '0' => 'a', + 'b' => '3', //key and value from array_index swapped 'c' => 2); //same as above, using integer var_dump(array_diff($array_index, $array_assoc)); @@ -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 3577c9d14b..8274d858ca 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -3,8 +3,8 @@ Test array_diff() function : usage variations - arrays containing referenced var --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of $arr1 that have values which are not - * present in any of the others arguments. + * Description: Returns the entries of $arr1 that have values which are not + * present in any of the others arguments. * Source code: ext/standard/array.c */ @@ -45,7 +45,7 @@ var_dump(array_diff($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Basic Comparison -- diff --git a/ext/standard/tests/array/array_diff_variation8.phpt b/ext/standard/tests/array/array_diff_variation8.phpt index 9d768fa731..99f9614d72 100644 --- a/ext/standard/tests/array/array_diff_variation8.phpt +++ b/ext/standard/tests/array/array_diff_variation8.phpt @@ -4,7 +4,7 @@ Test array_diff() function : usage variations - associative arrays contianing di <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) * Description: Returns the entries of $arr1 that have values which are - * not present in any of the others arguments. + * not present in any of the others arguments. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_diff_variation9.phpt b/ext/standard/tests/array/array_diff_variation9.phpt index 05b6a1eb02..83302378f0 100644 --- a/ext/standard/tests/array/array_diff_variation9.phpt +++ b/ext/standard/tests/array/array_diff_variation9.phpt @@ -5,8 +5,8 @@ error_reporting=E_ALL & ~E_NOTICE --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) - * Description: Returns the entries of arr1 that have values which are - * not present in any of the others arguments. + * Description: Returns the entries of arr1 that have values which are + * not present in any of the others arguments. * Source code: ext/standard/array.c */ 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..a368bbaf93 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_fill() function : basic functionality +Test array_fill() function : basic functionality --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -18,7 +18,7 @@ HERE_DOC; // array of possible valid values for 'val' argument $values = array ( - + /* 1 */ NULL, 0, 1, @@ -38,11 +38,11 @@ for($i = 0; $i < count($values); $i ++) var_dump( array_fill($start_key,$num,$val) ); $counter++; -} +} echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : basic functionality *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt index 2fbdb850c3..33ee2b3858 100644 --- a/ext/standard/tests/array/array_fill_error.phpt +++ b/ext/standard/tests/array/array_fill_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_fill() function : error conditions +Test array_fill() function : error conditions --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt index 59a2301c11..012a729d62 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_fill_keys() function : error conditions +Test array_fill_keys() function : error conditions --FILE-- <?php /* Prototype : proto array array_fill_keys(array keys, mixed val) - * Description: Create an array using the elements of the first parameter as keys each initialized to val + * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_fill_keys() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index 234aa6ef69..9fab89d7f2 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_fill_keys() function : variation of parameter +Test array_fill_keys() function : variation of parameter --FILE-- <?php /* Prototype : proto array array_fill_keys(array keys, mixed val) - * Description: Create an array using the elements of the first parameter as keys each initialized to val + * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index e44fa9570a..1c9382eb09 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_fill_keys() function : variation of parameter +Test array_fill_keys() function : variation of parameter --FILE-- <?php /* Prototype : proto array array_fill_keys(array keys, mixed val) - * Description: Create an array using the elements of the first parameter as keys each initialized to val + * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with reference types for the arguments */ @@ -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 601c7b11fe..c6eee72175 100644 --- a/ext/standard/tests/array/array_fill_keys_variation3.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_fill_keys() function : variation of parameter +Test array_fill_keys() function : variation of parameter --FILE-- <?php /* Prototype : proto array array_fill_keys(array keys, mixed val) - * Description: Create an array using the elements of the first parameter as keys each initialized to val + * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with unexpected argument types */ @@ -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_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 086a10df2a..209443db08 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_fill_keys() function : variation of parameter +Test array_fill_keys() function : variation of parameter --FILE-- <?php /* Prototype : proto array array_fill_keys(array keys, mixed val) - * Description: Create an array using the elements of the first parameter as keys each initialized to val + * Description: Create an array using the elements of the first parameter as keys each initialized to val * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* Testing with unexpected argument types */ diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt index c784b54415..aa1db044cc 100644 --- a/ext/standard/tests/array/array_fill_object.phpt +++ b/ext/standard/tests/array/array_fill_object.phpt @@ -3,7 +3,7 @@ Test array_fill() function : usage variations - various object values for 'val' --FILE-- <?php /* Prototype : array array_fill(int $start_key, int $num, mixed $val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -13,7 +13,7 @@ Test array_fill() function : usage variations - various object values for 'val' echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $start_key = 0; $num = 2; @@ -22,7 +22,7 @@ class Test { } -//class with public member, static member , constant and consturctor to initialize the public member +//class with public member, static member , constant and consturctor to initialize the public member class Test1 { const test1_constant = "test1"; @@ -78,14 +78,14 @@ class Child_test2 extends Test2 } } -// class with protected member, static member, constant and consturctor to initialize the protected member +// class with protected member, static member, constant and consturctor to initialize the protected member class Test3 { const test3_constant = "test3"; public static $test3_static = 0; protected $member1; var $var1 = 30; - var $var2; + var $var2; function __construct($value1 , $value2) { @@ -127,7 +127,7 @@ class Test4 class Child_test4 extends Test4 { var $var1; - + function __construct($value1 , $value2 , $value3 , $value4) { parent::__construct($value1 , $value2 , $value3); @@ -135,14 +135,14 @@ class Child_test4 extends Test4 } } -// abstract class with public, private, protected members +// abstract class with public, private, protected members abstract class AbstractClass { public $member1; private $member2; protected $member3; var $var1 = 30; - + abstract protected function display(); } @@ -173,7 +173,7 @@ class Template1 implements iTemplate //array of object values for 'val' argument $objects = array( - + /* 1 */ new Test(), new Test1(100 , 101), new Child_test1(100 , 101 , 102), @@ -187,7 +187,7 @@ $objects = array( /* 11 */ new Template1() ); -// loop through each element of the array for 'val' argument +// loop through each element of the array for 'val' argument // check the working of array_fill() echo "--- Testing array_fill() with different object values for 'val' argument ---\n"; $counter = 1; diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt index 1d779840cd..5701f79b48 100644 --- a/ext/standard/tests/array/array_fill_variation1.phpt +++ b/ext/standard/tests/array/array_fill_variation1.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $num = 2; $val = 100; @@ -60,13 +60,13 @@ $values = array( /* 11 */ NULL, null, - // boolean values + // boolean values /* 13 */ true, false, TRUE, FALSE, - // empty string + // empty string /* 17 */ "", '', @@ -80,14 +80,14 @@ $values = array( // undefined variable @$undefined_var, - // unset variable + // unset variable @$unset_var, // resource variable /* 24 */ $fp ); -// loop through each element of the array for start_key +// loop through each element of the array for start_key // check the working of array_fill() echo "--- Testing array_fill() with different values for 'start_key' arg ---\n"; $counter = 1; @@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $start_key = $values[$index]; - + var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } @@ -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..699e98b1b3 100644 --- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt +++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $num = 2; $val = 100; @@ -60,13 +60,13 @@ $values = array( /* 11 */ NULL, null, - // boolean values + // boolean values /* 13 */ true, false, TRUE, FALSE, - // empty string + // empty string /* 17 */ "", '', @@ -80,14 +80,14 @@ $values = array( // undefined variable @$undefined_var, - // unset variable + // unset variable @$unset_var, // resource variable /* 24 */ $fp ); -// loop through each element of the array for start_key +// loop through each element of the array for start_key // check the working of array_fill() echo "--- Testing array_fill() with different values for 'start_key' arg ---\n"; $counter = 1; @@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $start_key = $values[$index]; - + var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } @@ -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..d3955fdaaa 100644 --- a/ext/standard/tests/array/array_fill_variation2.phpt +++ b/ext/standard/tests/array/array_fill_variation2.phpt @@ -1,19 +1,19 @@ --TEST-- -Test array_fill() function : usage variations - unexpected values for 'num' argument +Test array_fill() function : usage variations - unexpected values for 'num' argument --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ /* - * testing array_fill() by passing different unexpected values for 'num' argument + * testing array_fill() by passing different unexpected values for 'num' argument */ echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $start_key = 0; $val = 100; @@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) $num = $values[$index]; var_dump( array_fill($start_key,$num,$val) ); - + $counter ++; } @@ -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_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt index 9c1857c61d..4a463a9c0e 100644 --- a/ext/standard/tests/array/array_fill_variation3.phpt +++ b/ext/standard/tests/array/array_fill_variation3.phpt @@ -3,7 +3,7 @@ Test array_fill() function : usage variations - unexpected values for 'val' arg --FILE-- <?php /* Prototype : array array_fill(int $start_key, int $num, mixed $val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -13,7 +13,7 @@ Test array_fill() function : usage variations - unexpected values for 'val' arg echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $start_key = 0; $num = 2; @@ -32,22 +32,22 @@ class test } -//array of different values for 'val' argument +//array of different values for 'val' argument $values = array( // empty string /* 1 */ "", '', - // objects + // objects /* 3 */ new test(), - // undefined variable + // undefined variable @$undefined_var, - // unset variable + // unset variable /* 5 */ @$unset_var, ); -// loop through each element of the array for 'val' argument +// loop through each element of the array for 'val' argument // check the working of array_fill() echo "--- Testing array_fill() with different values for 'val' argument ---\n"; $counter = 1; @@ -55,9 +55,9 @@ for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; $val = $values[$index]; - + var_dump( array_fill($start_key , $num , $val) ); - + $counter++; } diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index b750677e65..d3f9e4c1e7 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_fill() function : usage variations - using return value of array_fill for 'val' argument +Test array_fill() function : usage variations - using return value of array_fill for 'val' argument --FILE-- <?php /* Prototype : proto array array_fill(int start_key, int num, mixed val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ $heredoc = <<<HERE_DOC Hello HERE_DOC; -// array of possible valid values for 'val' argument +// array of possible valid values for 'val' argument $values = array ( /* 1 */ NULL, @@ -26,7 +26,7 @@ $values = array ( /* 4 */ 1.0, 'hi', "hi", - /* 7 */ $heredoc + /* 7 */ $heredoc ); echo "*** Filling 2 dimensional array with all basic valid values ***\n"; @@ -35,15 +35,15 @@ for($i =0; $i < count($values); $i ++) { echo "-- Iteration $counter --\n"; $val = $values[$i]; - + var_dump( array_fill($start_key,$num,array_fill($start_key,$num,$val)) ); - + $counter++; -} +} 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..341e0cf565 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -3,7 +3,7 @@ Test array_fill() function : usage variations - different types of array values --FILE-- <?php /* Prototype : array array_fill(int $start_key, int $num, mixed $val) - * Description: Create an array containing num elements starting with index start_key each initialized to val + * Description: Create an array containing num elements starting with index start_key each initialized to val * Source code: ext/standard/array.c */ @@ -13,14 +13,14 @@ Test array_fill() function : usage variations - different types of array values echo "*** Testing array_fill() : usage variations ***\n"; -// Initialise function arguments not being substituted +// Initialise function arguments not being substituted $start_key = 0; $num = 2; -//array of different types of array values for 'val' argument +//array of different types of array values for 'val' argument $values = array( - + /* 1 */ array(), array(1 , 2 , 3 , 4), array(1 => "Hi" , 2 => "Hello"), @@ -32,11 +32,11 @@ $values = array( array( true => "red" , FALSE => "green" ), /* 10 */ array( 1 => "Hi" , "color" => "red" , 'item' => 'pen'), array( NULL => "Hi", '1' => "Hello" , "1" => "Green"), - array( ""=>1, "color" => "green"), + array( ""=>1, "color" => "green"), /* 13 */ array('Saffron' , 'White' , 'Green') ); -// loop through each element of the values array for 'val' argument +// loop through each element of the values array for 'val' argument // check the working of array_fill() echo "--- Testing array_fill() with different types of array values for 'val' argument ---\n"; $counter = 1; @@ -44,7 +44,7 @@ for($i = 0; $i < count($values); $i++) { echo "-- Iteration $counter --\n"; $val = $values[$i]; - + var_dump( array_fill($start_key , $num , $val) ); $counter++; @@ -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.phpt b/ext/standard/tests/array/array_filter.phpt index ba27a59c96..94f8e39331 100644 --- a/ext/standard/tests/array/array_filter.phpt +++ b/ext/standard/tests/array/array_filter.phpt @@ -31,7 +31,7 @@ var_dump(array_filter("", null)); var_dump(array_filter($array1, 1)); echo '== DONE =='; -?> +?> --EXPECTF-- Odd : array(3) { diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt index 0b59c1cb75..28c10ff2e6 100644 --- a/ext/standard/tests/array/array_filter_basic.phpt +++ b/ext/standard/tests/array/array_filter_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : basic functionality +Test array_filter() function : basic functionality --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_filter_error.phpt index 14fb78fb12..3f8f51bc14 100644 --- a/ext/standard/tests/array/array_filter_error.phpt +++ b/ext/standard/tests/array/array_filter_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : error conditions +Test array_filter() function : error conditions --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_filter_object.phpt b/ext/standard/tests/array/array_filter_object.phpt index 3ea93e5602..de782fe69b 100644 --- a/ext/standard/tests/array/array_filter_object.phpt +++ b/ext/standard/tests/array/array_filter_object.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : object functionality +Test array_filter() function : object functionality --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -42,7 +42,7 @@ abstract class AbstractClass class ChildClass extends AbstractClass { private $var3; - public function emptyMethod() { + public function emptyMethod() { echo "defined in child"; } } @@ -51,7 +51,7 @@ class ChildClass extends AbstractClass class FinalClass { private $var4; - final function finalMethod() { + final function finalMethod() { echo 'This can not be overloaded'; } } @@ -79,8 +79,8 @@ function always_false($input) // 'input' array containing objects as elements $input = array( - new SimpleClass(), - new EmptyClass(), + new SimpleClass(), + new EmptyClass(), new ChildClass(), new FinalClass(), new StaticClass() diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt index e257844f26..bbcff3818c 100644 --- a/ext/standard/tests/array/array_filter_variation1.phpt +++ b/ext/standard/tests/array/array_filter_variation1.phpt @@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Unexpected values for 'input' --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -76,7 +76,7 @@ $input_values = array( // object data /*20*/ new MyClass(), - + // resource data $fp, @@ -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_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt index 4749fe8e45..b23618794e 100644 --- a/ext/standard/tests/array/array_filter_variation10.phpt +++ b/ext/standard/tests/array/array_filter_variation10.phpt @@ -3,7 +3,7 @@ Test array_filter() function : usage variations - using the array keys inside 'c --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback [, bool $use_type = ARRAY_FILTER_USE_VALUE]]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_filter_variation2.phpt b/ext/standard/tests/array/array_filter_variation2.phpt index d47761f470..1aa262ba62 100644 --- a/ext/standard/tests/array/array_filter_variation2.phpt +++ b/ext/standard/tests/array/array_filter_variation2.phpt @@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Unexpected values for 'callbac --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt index 70ad689f4d..c4a12e661b 100644 --- a/ext/standard/tests/array/array_filter_variation3.phpt +++ b/ext/standard/tests/array/array_filter_variation3.phpt @@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Different types of array for ' --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -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..03a08835b9 100644 --- a/ext/standard/tests/array/array_filter_variation4.phpt +++ b/ext/standard/tests/array/array_filter_variation4.phpt @@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Different types of 'callback' --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -46,7 +46,7 @@ var_dump( array_filter($input, "callback3") ); // callback function with parameter and with return value function callback4($input) { - if($input > 0 ) { + if($input > 0 ) { return true; } else { @@ -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..f35c321376 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -3,12 +3,12 @@ Test array_filter() function : usage variations - 'input' argument with differen --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ /* -* With default callback function argument, array_filter() removes elements which are interpreted as false +* With default callback function argument, array_filter() removes elements which are interpreted as false * Here Testing all the false array element possibilities */ @@ -55,17 +55,17 @@ $input = array( ); // With default callback function -var_dump( array_filter($input) ); +var_dump( array_filter($input) ); // With callback function which returns always true -var_dump( array_filter($input, 'always_true') ); +var_dump( array_filter($input, 'always_true') ); // With callback function which returns always false -var_dump( array_filter($input, 'always_false') ); +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..2e7ea77dca 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - 'input' array containing references +Test array_filter() function : usage variations - 'input' array containing references --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -29,7 +29,7 @@ function callback($input) return false; } } - + // initializing variables $value1 = array(1, 2, 8); $value2 = array(5, 6, 4); @@ -39,11 +39,11 @@ $input = array(&$value1, 10, &$value2, 'value'); var_dump( array_filter($input, 'callback') ); // with default 'callback' argument -var_dump( array_filter($input) ); +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..25e3c94d31 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - anonymous callback functions +Test array_filter() function : usage variations - anonymous callback functions --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -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..810cb89732 100644 --- a/ext/standard/tests/array/array_filter_variation8.phpt +++ b/ext/standard/tests/array/array_filter_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - Callback function with different return values +Test array_filter() function : usage variations - Callback function with different return values --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -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_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt index ed89d13d35..81554f13e1 100644 --- a/ext/standard/tests/array/array_filter_variation9.phpt +++ b/ext/standard/tests/array/array_filter_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_filter() function : usage variations - built-in functions as 'callback' argument +Test array_filter() function : usage variations - built-in functions as 'callback' argument --FILE-- <?php /* Prototype : array array_filter(array $input [, callback $callback]) - * Description: Filters elements from the array via the callback. + * Description: Filters elements from the array via the callback. * Source code: ext/standard/array.c */ @@ -24,7 +24,7 @@ var_dump( array_filter($input, 'chr') ); // using language construct 'echo' as 'callback' var_dump( array_filter($input, 'echo') ); -// using language construct 'exit' as 'callback' +// using language construct 'exit' as 'callback' var_dump( array_filter($input, 'exit') ); echo "Done" diff --git a/ext/standard/tests/array/array_flip.phpt b/ext/standard/tests/array/array_flip.phpt index ab8cf271b1..c268f5aaf6 100644 --- a/ext/standard/tests/array/array_flip.phpt +++ b/ext/standard/tests/array/array_flip.phpt @@ -2,15 +2,15 @@ basic array_flip test --FILE-- <?php -$trans = array("a" => 1, - "b" => 1, - "c" => 2, - "z" => 0, - "d" => TRUE, - "E" => FALSE, - "F" => NULL, - 0 => "G", - 1 => "h", +$trans = array("a" => 1, + "b" => 1, + "c" => 2, + "z" => 0, + "d" => TRUE, + "E" => FALSE, + "F" => NULL, + 0 => "G", + 1 => "h", 2 => "i"); $trans = array_flip($trans); var_dump($trans); diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index c704b295fe..ab326b4ab6 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test array_flip() function : basic functionality +Test array_flip() function : basic functionality --FILE-- <?php /* Prototype : array array_flip(array $input) - * Description: Return array with key <-> value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ echo "*** Testing array_flip() : basic functionality ***\n"; // array with default keys - numeric values -$input = array(1, 2); +$input = array(1, 2); var_dump( array_flip($input) ); // array with default keys - string values @@ -18,7 +18,7 @@ $input = array('value1', "value2"); var_dump( array_flip($input) ); // associative arrays - key as string -$input = array('key1' => 1, "key2" => 2); +$input = array('key1' => 1, "key2" => 2); var_dump( array_flip($input) ); // associative arrays - key as numeric @@ -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_error.phpt b/ext/standard/tests/array/array_flip_error.phpt index c193a00896..3aa0f98271 100644 --- a/ext/standard/tests/array/array_flip_error.phpt +++ b/ext/standard/tests/array/array_flip_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_flip() function : error conditions +Test array_flip() function : error conditions --FILE-- <?php /* Prototype : array array_flip(array $input) - * Description: Return array with key <-> value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt index 5dd84e600b..9fbfdf0139 100644 --- a/ext/standard/tests/array/array_flip_variation1.phpt +++ b/ext/standard/tests/array/array_flip_variation1.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - unexpected values for 'input' ar --FILE-- <?php /* Prototype : array array_flip(array $input) - * Description: Return array with key <-> value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ @@ -24,7 +24,7 @@ class MyClass //resource variable $fp = fopen(__FILE__,'r'); - + //array of values for 'input' argument $values = array( // int data @@ -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_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt Binary files differindex 8d86210f0f..997c391306 100644 --- a/ext/standard/tests/array/array_flip_variation2.phpt +++ b/ext/standard/tests/array/array_flip_variation2.phpt diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt Binary files differindex b1159d4382..a3ad5acd88 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_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt index b8badb0caa..2420c7e00f 100644 --- a/ext/standard/tests/array/array_flip_variation4.phpt +++ b/ext/standard/tests/array/array_flip_variation4.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with different --FILE-- <?php /* Prototype : array array_flip(array $input) - * Description: Return array with key <-> value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ @@ -38,7 +38,7 @@ $input = array( 'bool_value2' => false, 'bool_value3' => TRUE, 'bool_value4' => FALSE, - + // null values 'null_value1' => null, @@ -51,7 +51,7 @@ $input = array( // resource value 'resource_value' => $fp, ); - + var_dump( array_flip($input) ); // closing resource diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index f39a49069a..cf60dc6955 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with repeatitiv --FILE-- <?php /* Prototype : array array_flip(array $input) - * Description: Return array with key <-> value flipped + * Description: Return array with key <-> value flipped * Source code: ext/standard/array.c */ @@ -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 d509487ec5..c1d381051a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test array_intersect_assoc() function : basic functionality +Test array_intersect_assoc() function : basic functionality --FILE-- <?php /* Prototype : array array_intersect_assoc(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. - * Keys are used to do more restrictive check + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. + * Keys are used to do more restrictive check * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt index a06dbddefe..c371071b38 100644 --- a/ext/standard/tests/array/array_intersect_assoc_error.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_error.phpt @@ -3,8 +3,8 @@ Test array_intersect_assoc() function : error conditions(Bug#43197) --FILE-- <?php /* Prototype : array array_intersect_assoc(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. - * Keys are used to do more restrictive check + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. + * Keys are used to do more restrictive check * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt index 9c372c9522..406e82a86f 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt @@ -20,7 +20,7 @@ echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr1 a $arr2 = array(1, 2); // additional array to be passed for intersection -$arr3 = array(1, 2, "one" => 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -71,7 +71,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -94,7 +94,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iteration $iterator --"; - + // Calling array_intersect_assoc() with default arguments var_dump( array_intersect_assoc($unexpected_value, $arr2) ); @@ -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 b230271be4..95631fc1ac 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_assoc() function : usage variations - binary safe checking +Test array_intersect_assoc() function : usage variations - binary safe checking --FILE-- <?php /* Prototype : array array_intersect_assoc(array $arr1, array $arr2 [, array $...]) @@ -9,8 +9,8 @@ Test array_intersect_assoc() function : usage variations - binary safe checking */ /* -* Testing the behavior of array_intersect_assoc() by passing array with -* binary values for $arr1 and $arr2 argument. +* Testing the behavior of array_intersect_assoc() by passing array with +* binary values for $arr1 and $arr2 argument. */ echo "*** Testing array_intersect_assoc() : binary safe checking ***\n"; @@ -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..59ba9048d3 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt @@ -71,7 +71,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -94,7 +94,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iteration $iterator --"; - + // Calling array_intersect_assoc() with default arguments var_dump( array_intersect_assoc($arr1,$unexpected_value) ); @@ -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..af7df4f35c 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt @@ -9,7 +9,7 @@ Test array_intersect_assoc() function : usage variations - different arrays for */ /* -* Passing different types of arrays to $arr1 argument and testing whether +* Passing different types of arrays to $arr1 argument and testing whether * array_intersect_assoc() behaves in an expected way with the other arguments passed to the function * The $arr2 argument passed is a fixed array. */ @@ -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 6e15acf114..495ec30ff9 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -9,8 +9,8 @@ Test array_intersect_assoc() function : usage variations - different arrays for */ /* -* Passing different types of arrays to $arr2 argument and testing whether -* array_intersect_assoc() behaves in an expected way with the other arguments passed to the function. +* Passing different types of arrays to $arr2 argument and testing whether +* array_intersect_assoc() behaves in an expected way with the other arguments passed to the function. * The $arr1 argument passed is a fixed array. */ @@ -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..0aa109933a 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt @@ -60,7 +60,7 @@ $arrays = array ( // array to be passsed to $arr2 argument $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4", - "\tHello" => 111, 2.2, 'color', "Hello world" => "string", + "\tHello" => 111, 2.2, 'color', "Hello world" => "string", "pen\n" => 33, 133 => "int"); // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() @@ -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..f3e6964d7b 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt @@ -49,7 +49,7 @@ $arrays = array ( "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc - // array with unset variable + // array with unset variable /*10*/ array( @$unset_var => "hello"), // array with mixed keys @@ -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_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt index ca803e50a9..ba2f79a7ec 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt @@ -60,15 +60,15 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr2 argument -$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, - "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', - "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, +$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, + "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld', + "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, "int" => 133, 222 => "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc() diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt index a287f4742f..6ec8fb08d7 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt @@ -60,8 +60,8 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 26a491ad64..338d40936e 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments +Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments --FILE-- <?php /* Prototype : array array_intersect_assoc(array $arr1, array $arr2 [, array $...]) @@ -10,7 +10,7 @@ Test array_intersect_assoc() function : usage variations - two dimensional array /* * Testing the behavior of array_intersect_assoc() by passing 2-D arrays -* to both $arr1 and $arr2 argument. +* to both $arr1 and $arr2 argument. * Optional argument takes the same value as that of $arr1 */ @@ -18,7 +18,7 @@ echo "*** Testing array_intersect_assoc() : passing two dimensional array to bot // two dimensional arrays for $arr1 and $arr2 argument $arr1 = array ( - + // arrays with default keys array(1, 2, "hello", 'world'), array(1, 2, 3, 4), @@ -26,7 +26,7 @@ $arr1 = array ( // arrays with explicit keys array(1 => "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt index 702260b49f..03661f2756 100644 --- a/ext/standard/tests/array/array_intersect_basic.phpt +++ b/ext/standard/tests/array/array_intersect_basic.phpt @@ -3,12 +3,12 @@ Test array_intersect() function : basic functionality --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ /* -* Testing the behavior of array_intersect() by passing different arrays for the arguments. +* Testing the behavior of array_intersect() by passing different arrays for the arguments. * Function is tested by passing associative array as well as array with default keys. */ @@ -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_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt index 373a0ddbe0..46f77ac9bd 100644 --- a/ext/standard/tests/array/array_intersect_error.phpt +++ b/ext/standard/tests/array/array_intersect_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_intersect() function : error conditions +Test array_intersect() function : error conditions --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ 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_basic.phpt b/ext/standard/tests/array/array_intersect_key_basic.phpt index c24a4c1b08..fc6e177f54 100644 --- a/ext/standard/tests/array/array_intersect_key_basic.phpt +++ b/ext/standard/tests/array/array_intersect_key_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_intersect_key(): Basic Test +array_intersect_key(): Basic Test --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt index 10ad8ad342..9509e97b9c 100644 --- a/ext/standard/tests/array/array_intersect_key_error.phpt +++ b/ext/standard/tests/array/array_intersect_key_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_intersect_key() function : error conditions +Test array_intersect_key() function : error conditions --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt index 026d203b53..b98832461a 100644 --- a/ext/standard/tests/array/array_intersect_key_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt @@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ @@ -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..56e5f1494d 100644 --- a/ext/standard/tests/array/array_intersect_key_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt @@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ @@ -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..00875ee9ff 100644 --- a/ext/standard/tests/array/array_intersect_key_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation3.phpt @@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ @@ -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..24e649fe15 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing integer indexed --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); +$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); $input_arrays = array( 'decimal indexed' => array(10 => '10', '-17' => '-17'), @@ -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..c89add62ec 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -3,22 +3,22 @@ Test array_intersect_key() function : usage variation - Passing float indexed ar --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); -$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); +$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); +$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); echo "\n-- Testing array_intersect_key() function with float indexed array --\n"; 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..b671e11e92 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing boolean indexed --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF'); echo "\n-- Testing array_intersect_key() function with boolean indexed array --\n"; @@ -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..4dabf8d1b7 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing null,unset and u --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ echo "*** Testing array_intersect_key() : usage variation ***\n"; // Initialise function arguments not being substituted (if any) -$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); +$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); //get an unset variable $unset_var = 10; unset ($unset_var); @@ -25,10 +25,10 @@ foreach($input_arrays as $key =>$value) { echo "\n--$key--\n"; var_dump( array_intersect_key($input_array, $value) ); var_dump( array_intersect_key($value,$input_array ) ); -} +} ?> ===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..5792930afc 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing Multi dimensiona --FILE-- <?php /* Prototype : array array_intersect_key(array arr1, array arr2 [, array ...]) - * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. + * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. * Source code: ext/standard/array.c */ @@ -13,25 +13,25 @@ echo "*** Testing array_intersect_key() : usage variation ***\n"; $array1 = array( 'first' => array('blue' => 1, 'red' => 2), - + 'second' => array('yellow' => 7), - + 'third' => array(0 =>'zero'), ); $array2 = array ( 'first' => array('blue' => 1, 'red' => 2,), - + 'second' => array('cyan' => 8), - - 'fourth' => array(2 => 'two'), + + 'fourth' => array(2 => 'two'), ); var_dump( array_intersect_key($array1, $array2) ); -var_dump( array_intersect_key($array2,$array1 ) ); +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_error.phpt b/ext/standard/tests/array/array_intersect_uassoc_error.phpt index f7ee0303ed..ae7acb133b 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_error.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_intersect_uassoc() function : error conditions +Test array_intersect_uassoc() function : error conditions --FILE-- <?php /* Prototype : array array_intersect_uassoc(array arr1, array arr2 [, array ...], callback key_compare_func) @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : error conditions echo "*** Testing array_intersect_uassoc() : error conditions ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index ac825682b0..d8e87e4277 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); @@ -115,209 +115,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..9fda4da434 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -18,11 +18,11 @@ class MyClass static function static_compare_func($a, $b) { return strcasecmp($a, $b); } - + public function class_compare_func($a, $b) { return strcasecmp($a, $b); } - + } echo "\n-- Testing array_intersect_uassoc() function using class with static method as callback --\n"; @@ -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_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt index c880f7a057..cf2611aeb9 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing class without echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index dd3cd05dc0..b471d93a95 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array3 = array("a"=>"green", "brown"); @@ -115,209 +115,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 edda0b5ef9..01facf2355 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); @@ -114,131 +114,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_variation4.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt index d998721bd8..e5d0f56568 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt @@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va echo "*** Testing array_intersect_uassoc() : usage variation ***\n"; -// Initialise function arguments +// Initialise function arguments $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red"); $array2 = array("a" => "green", "yellow", "red"); $array3 = array("a"=>"green", "brown"); 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_basic.phpt b/ext/standard/tests/array/array_intersect_ukey_basic.phpt index 57ed1322fe..db21b9b01e 100644 --- a/ext/standard/tests/array/array_intersect_ukey_basic.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_intersect_ukey(): Basic test. +array_intersect_ukey(): Basic test. --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_intersect_ukey_error.phpt b/ext/standard/tests/array/array_intersect_ukey_error.phpt index 793ec3d252..bb052fbf76 100644 --- a/ext/standard/tests/array/array_intersect_ukey_error.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_intersect_ukey() function : error conditions +Test array_intersect_ukey() function : error conditions --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //Test array_intersect_ukey with one more than the expected number of arguments diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index 0f97998078..4eb2253f9b 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt index 7156bf5404..69a6500d2f 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing class without s --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 42f3947c06..5bfe56065c 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -19,7 +19,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt index d99059e52d..1236bcd3df 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt index b595bceb7c..4d58cb7c2c 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -20,7 +20,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } //get an unset variable @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index 59fb1c48d0..b512b06040 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of integer --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of integers and floating point intersection --\n"; @@ -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 cc9d8bbd15..6231a657a9 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of floatin --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -20,7 +20,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of floating points and strings containing integers intersection --\n"; @@ -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 af5e002a69..c79277df56 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of strings --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ function key_compare_func($key1, $key2) if ($key1 == $key2) return 0; else - return ($key1 > $key2)? 1:-1; + return ($key1 > $key2)? 1:-1; } echo "\n-- Result of strings containing integers intersection --\n"; @@ -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_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index c686899aad..89286f8986 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing non-existing fu --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index 15abb92841..38c91fca07 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing class/object me --FILE-- <?php /* Prototype : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func) - * Description: Computes the intersection of arrays using a callback function on the keys for comparison. + * Description: Computes the intersection of arrays using a callback function on the keys for comparison. * Source code: ext/standard/array.c */ @@ -18,11 +18,11 @@ class MyClass static function static_compare_func($key1, $key2) { return strcasecmp($key1, $key2); } - + public function class_compare_func($key1, $key2) { return strcasecmp($key1, $key2); } - + } echo "\n-- Testing array_intersect_ukey() function using class with static method as callback --\n"; @@ -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..e171cbb7bf 100644 --- a/ext/standard/tests/array/array_intersect_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_variation1.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - unexpected values for 'arr1 --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -19,7 +19,7 @@ echo "*** Testing array_intersect() : Passing non-array values to \$arr1 argumen $arr2 = array(1, 2); // array to be passed to optional argument -$arr3 = array(1, 2, "one" => 1, "two" => 2); +$arr3 = array(1, 2, "one" => 1, "two" => 2); // get an unset variable $unset_var = 10; @@ -70,7 +70,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -93,7 +93,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iterator $iterator --"; - + // Calling array_intersect() with default arguments var_dump( array_intersect($unexpected_value,$arr2) ); @@ -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..266f9b8f89 100644 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_variation10.phpt @@ -1,15 +1,15 @@ --TEST-- -Test array_intersect() function : usage variations - binary safe checking +Test array_intersect() function : usage variations - binary safe checking --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ /* -* Testing the behavior of array_intersect() by passing array with -* binary values for $arr1 and $arr2 argument. +* Testing the behavior of array_intersect() by passing array with +* binary values for $arr1 and $arr2 argument. */ echo "*** Testing array_intersect() : binary safe checking ***\n"; @@ -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..976211deec 100644 --- a/ext/standard/tests/array/array_intersect_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_variation2.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - unexpected values for 'arr2 --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -70,7 +70,7 @@ $arrays = array( // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', @@ -93,7 +93,7 @@ $arrays = array( $iterator = 1; foreach($arrays as $unexpected_value) { echo "\n-- Iterator $iterator --"; - + // Calling array_intersect() with default arguments var_dump( array_intersect($arr1,$unexpected_value) ); @@ -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..aa0f0b704a 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -3,12 +3,12 @@ Test array_intersect() function : usage variations - different arrays for 'arr1' --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ /* -* Passing different types of arrays to $arr1 argument and testing whether +* Passing different types of arrays to $arr1 argument and testing whether * array_intersect() behaves in expected way with the other arguments passed to the function * The $arr2 argument is a fixed array. */ @@ -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..93419842cb 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -3,13 +3,13 @@ Test array_intersect() function : usage variations - different arrays for 'arr2' --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ /* -* Passing different types of arrays to $arr2 argument and testing whether -* array_intersect() behaves in expected way with the other arguments passed to the function. +* Passing different types of arrays to $arr2 argument and testing whether +* array_intersect() behaves in expected way with the other arguments passed to the function. * The $arr1 argument is a fixed array. */ @@ -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..14f8cdd6d1 100644 --- a/ext/standard/tests/array/array_intersect_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_variation5.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff keys --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -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..8534bd2a8a 100644 --- a/ext/standard/tests/array/array_intersect_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_variation6.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff keys --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -48,7 +48,7 @@ $arrays = array ( "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc - // array with unset variable + // array with unset variable /*10*/ array( @$unset_var => "hello"), // array with mixed keys @@ -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_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt index 4da1b9b7ac..da1088c5ed 100644 --- a/ext/standard/tests/array/array_intersect_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_variation7.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -59,13 +59,13 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr2 argument -$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, +$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, "Hello world", $heredoc, new classA(), 444.432, "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect() diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt index 2934fe09a4..91eae49aab 100644 --- a/ext/standard/tests/array/array_intersect_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_variation8.phpt @@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ @@ -59,13 +59,13 @@ $arrays = array ( /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); // array to be passsed to $arr1 argument -$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, +$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, "Hello world", $heredoc, new classA(), 444.432, "fruit"); // loop through each sub-array within $arrrays to check the behavior of array_intersect() diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt index 6c7c956ea7..0dba1af6d3 100644 --- a/ext/standard/tests/array/array_intersect_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_variation9.phpt @@ -3,13 +3,13 @@ Test array_intersect() function : usage variations - two dimensional arrays for --FILE-- <?php /* Prototype : array array_intersect(array $arr1, array $arr2 [, array $...]) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments + * Description: Returns the entries of arr1 that have values which are present in all the other arguments * Source code: ext/standard/array.c */ /* * Testing the behavior of array_intersect() by passing 2-D arrays -* to both $arr1 and $arr2 argument. +* to both $arr1 and $arr2 argument. * Optional argument takes the same value as that of $arr1 */ @@ -17,7 +17,7 @@ echo "*** Testing array_intersect() : passing two dimensional array to both \$ar // two dimensional arrays for $arr1 and $arr2 argument $arr1 = array ( - + // arrays with default keys array(1, 2, "hello", 'world'), array(1, 2, 3, 4), @@ -25,7 +25,7 @@ $arr1 = array ( // arrays with explicit keys array(1 => "one", 2 => "two", 3 => "three"), array("ten" => 10, "twenty" => 20.00, "thirty" => 30) -); +); $arr2 = array ( array(1, 2, 3, 4), diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index 63bcf82d93..95ca367284 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -2,13 +2,13 @@ Test array_key_exists() function --FILE-- <?php -/* Prototype: +/* Prototype: * bool array_key_exists ( mixed $key, array $search ); * Description: - * Returns TRUE if the given key is set in the array. - * key can be any value possible for an array index. + * Returns TRUE if the given key is set in the array. + * key can be any value possible for an array index. * Also also works on objects. - */ + */ echo "*** Testing basic functionalities ***\n"; /* Arrays with regular values */ @@ -22,9 +22,9 @@ $search_arrays = array( array(0 => 'Zero', 1 => 'One', 2 => 'Two', 3 => "Three" ), array(0.1 => 'Zero', 1.1 => 'One', 2.2 => 'Two', 3.3 => "Three" ) ); -/* keys to search in $search_arrays. $keys[0] +/* keys to search in $search_arrays. $keys[0] is the key to be searched in $search_arrays[0] and so on */ -$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); +$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); $key_counter = 0; foreach ($search_arrays as $search_array) { @@ -48,7 +48,7 @@ foreach ($search_arrays as $search_array) { var_dump( array_key_exists($key, $search_array) ); } } -// arrays with variation in elements +// arrays with variation in elements $search_arrays_v = array ( array(), array(NULL), @@ -71,24 +71,24 @@ foreach ($search_arrays_v as $search_array) { echo "\n*** Testing error conditions ***\n"; //Zeor args var_dump( array_key_exists() ); -// first args as array +// first args as array var_dump( array_key_exists(array(), array()) ); // second args as string -var_dump( array_key_exists("", "") ); +var_dump( array_key_exists("", "") ); // second args a integer -var_dump( array_key_exists(1, 1) ); +var_dump( array_key_exists(1, 1) ); // second args as NULL -var_dump( array_key_exists(1, NULL) ); +var_dump( array_key_exists(1, NULL) ); // second args as boolean -var_dump( array_key_exists(1, true) ); +var_dump( array_key_exists(1, true) ); // first args as boolean -var_dump( array_key_exists(false, true) ); -// second args as float -var_dump( array_key_exists(false, 17.5) ); -// args more than expected -var_dump( array_key_exists(1, array(), array()) ); +var_dump( array_key_exists(false, true) ); +// second args as float +var_dump( array_key_exists(false, 17.5) ); +// args more than expected +var_dump( array_key_exists(1, array(), array()) ); // first argument as floating point value -var_dump( array_key_exists(17.5, array(1,23) ) ) ; +var_dump( array_key_exists(17.5, array(1,23) ) ) ; echo "\n*** Testing operation on objects ***\n"; class key_check @@ -118,7 +118,7 @@ var_dump(array_key_exists("var", $key_check_obj->arr)); //found, key is in memb var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing basic functionalities *** -- Iteration 1 -- bool(true) @@ -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 1c40fdb809..6ebaf56ded 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_key_exists() function : basic functionality +Test array_key_exists() function : basic functionality --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -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_error.phpt b/ext/standard/tests/array/array_key_exists_error.phpt index 1691cc5fa1..8b189c80e1 100644 --- a/ext/standard/tests/array/array_key_exists_error.phpt +++ b/ext/standard/tests/array/array_key_exists_error.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : error conditions - Pass incorrect number of a --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index e00d414d71..70fb49a725 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : object functionality --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -18,7 +18,7 @@ class myClass { var $var1; var $var2; var $var3; - + function __construct($a, $b, $c = null) { $this->var1 = $a; $this->var2 = $b; @@ -47,7 +47,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 fac71b9487..78c20c9c72 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : object functionality - different visibilities --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -18,7 +18,7 @@ class myClass { public $var1; protected $var2; private $var3; - + function __construct($a, $b, $c = null) { $this->var1 = $a; $this->var2 = $b; @@ -49,7 +49,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_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index b989160db7..2f50d3e86f 100644 --- a/ext/standard/tests/array/array_key_exists_variation1.phpt +++ b/ext/standard/tests/array/array_key_exists_variation1.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - Pass different data types --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "key", 'key', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt index 62bd4d2ae8..30c498768e 100644 --- a/ext/standard/tests/array/array_key_exists_variation2.phpt +++ b/ext/standard/tests/array/array_key_exists_variation2.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - Pass different data types --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -104,22 +104,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 -- @@ -159,22 +159,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_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt index 0517d4c24e..e8a52a7059 100644 --- a/ext/standard/tests/array/array_key_exists_variation3.phpt +++ b/ext/standard/tests/array/array_key_exists_variation3.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - floats and casting to ints --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index efd3a13924..4bf3473ef3 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - referenced variables --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -23,7 +23,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 2098ca33ac..2144fb893c 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - multidimensional arrays --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -14,8 +14,8 @@ Test array_key_exists() function : usage variations - multidimensional arrays echo "*** Testing array_key_exists() : usage variations ***\n"; -$multi_array = array ('zero' => 'val1', - 'one' => 'val2', +$multi_array = array ('zero' => 'val1', + 'one' => 'val2', 'sub1' => array (1, 2, 3)); echo "\n-- Attempt to match key in sub-array --\n"; @@ -28,7 +28,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 09fe30d958..abfba0a4c3 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -3,13 +3,13 @@ Test array_key_exists() function : usage variations - equality test for certain --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ /* - * Pass certain data types that can be taken as a key in an array + * Pass certain data types that can be taken as a key in an array * and test whether array_key_exists(() thinks they are equal and therefore * returns true when searching for them */ @@ -18,10 +18,10 @@ echo "*** Testing array_key_exists() : usage variations ***\n"; $unset = 10; unset($unset); -$array = array ('null' => null, - 'NULL' => NULL, - 'empty single quoted string' => '', - "empty double quoted string" => "", +$array = array ('null' => null, + 'NULL' => NULL, + 'empty single quoted string' => '', + "empty double quoted string" => "", 'undefined variable' => @$undefined, 'unset variable' => @$unset); @@ -30,7 +30,7 @@ foreach($array as $name => $input) { $iterator = 1; echo "\n-- Key in \$search array is : $name --\n"; $search[$input] = 'test'; - + //iterate through array again to see which values are considered equal foreach($array as $key) { echo "Iteration $iterator: "; @@ -43,7 +43,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 8d9beacc75..6211882222 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - position of internal array --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -25,7 +25,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 70da85fd18..522fd67e99 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - array keys are different d --FILE-- <?php /* Prototype : bool array_key_exists(mixed $key, array $search) - * Description: Checks if the given key or index exists in the array + * Description: Checks if the given key or index exists in the array * Source code: ext/standard/array.c * Alias to functions: key_exists */ @@ -42,7 +42,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', @@ -110,7 +110,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..a6203fbbf5 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -5,14 +5,14 @@ Test array_keys() function (variation - 1) echo "\n*** Testing array_keys() on various arrays ***"; $arrays = array( - array(), + array(), array(0), - array( array() ), - array("Hello" => "World"), - array("" => ""), + array( array() ), + array("Hello" => "World"), + array("" => ""), array(1,2,3, "d" => array(4,6, "d")), array("a" => 1, "b" => 2, "c" =>3, "d" => array()), - array(0 => 0, 1 => 1, 2 => 2, 3 => 3), + array(0 => 0, 1 => 1, 2 => 2, 3 => 3), array(0.001=>3.000, 1.002=>2, 1.999=>3, "a"=>3, 3=>5, "5"=>3.000), array(TRUE => TRUE, FALSE => FALSE, NULL => NULL, "\x000", "\000"), array("a" => "abcd", "a" => "", "ab" => -6, "cd" => -0.5 ), @@ -23,13 +23,13 @@ $i = 0; /* loop through to test array_keys() with different arrays */ foreach ($arrays as $array) { echo "\n-- Iteration $i --\n"; - var_dump(array_keys($array)); + var_dump(array_keys($array)); $i++; } 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..1e7f0df4ad 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, @@ -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..04f574d810 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n"; $arr_range = array( 2147483647 => 1, 2147483648 => 2, - -2147483647 => 3, + -2147483647 => 3, -2147483648 => 4, -2147483649 => 5, -0 => 6, @@ -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..b3a97a0dfb 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", @@ -21,12 +21,12 @@ $types_arr = array( $values = array(TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); foreach ($values as $value){ var_dump($value); - var_dump(array_keys($types_arr, $value)); + var_dump(array_keys($types_arr, $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..081660d51b 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -9,7 +9,7 @@ $types_arr = array( FALSE => FALSE, 1 => 1, 0 => 0, - -1 => -1, + -1 => -1, "1" => "1", "0" => "0", "-1" => "-1", @@ -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..ee37400801 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -8,9 +8,9 @@ $resource1 = fopen( __FILE__, "r"); $resource2 = opendir( "." ); /* creating an array with resource types as elements */ -$arr_resource = array($resource1, $resource2); +$arr_resource = array($resource1, $resource2); -var_dump(array_keys($arr_resource, $resource1)); // loose type checking +var_dump(array_keys($arr_resource, $resource1)); // loose type checking var_dump(array_keys($arr_resource, $resource1, TRUE)); // strict type checking var_dump(array_keys($arr_resource, $resource2)); // loose type checking var_dump(array_keys($arr_resource, $resource2, TRUE)); // strict type checking @@ -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..087e3ba284 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -5,18 +5,18 @@ array_map() and exceptions in the callback $a = array(1,2,3); -function foo() { - throw new exception(1); -} +function foo() { + throw new exception(1); +} -try { - array_map("foo", $a, array(2,3)); +try { + array_map("foo", $a, array(2,3)); } catch (Exception $e) { var_dump("exception caught!"); } 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_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt index 7cfb528bf2..c98b2cf29c 100644 --- a/ext/standard/tests/array/array_map_object2.phpt +++ b/ext/standard/tests/array/array_map_object2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test array_map() function : object functionality - with non-existent class and method +Test array_map() function : object functionality - with non-existent class and method --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt index 114d1d3134..9424c44110 100644 --- a/ext/standard/tests/array/array_map_object3.phpt +++ b/ext/standard/tests/array/array_map_object3.phpt @@ -29,7 +29,7 @@ class ParentClass } } -class ChildClass extends ParentClass +class ChildClass extends ParentClass { var $parent_obj; public function __construct ( ) { diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt index 2eb0d115e0..12cf551da5 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - anonymous callback function --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -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..6a17b299ee 100644 --- a/ext/standard/tests/array/array_map_variation11.phpt +++ b/ext/standard/tests/array/array_map_variation11.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - with recursive callback --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -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_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt index b258c2d31b..5c6d9fb97a 100644 --- a/ext/standard/tests/array/array_map_variation12.phpt +++ b/ext/standard/tests/array/array_map_variation12.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - built-in function as callback --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt index 9f7173dfeb..d83f78cbfa 100644 --- a/ext/standard/tests/array/array_map_variation13.phpt +++ b/ext/standard/tests/array/array_map_variation13.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - callback function with different --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -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_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index 1cfbdd7beb..d9440bb2c1 100644 --- a/ext/standard/tests/array/array_map_variation17.phpt +++ b/ext/standard/tests/array/array_map_variation17.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - unexpected values for 'callback' --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -47,7 +47,7 @@ $unexpected_callbacks = array( false, TRUE, FALSE, - + // empty data /*14*/ "", '', diff --git a/ext/standard/tests/array/array_map_variation18.phpt b/ext/standard/tests/array/array_map_variation18.phpt index 8e1a862587..ef235e730c 100644 --- a/ext/standard/tests/array/array_map_variation18.phpt +++ b/ext/standard/tests/array/array_map_variation18.phpt @@ -67,7 +67,7 @@ $unexpected_inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $unexpected_inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), @@ -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 0e56428a03..1f4d2f5679 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_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt index d99a529e3a..fcc4090632 100644 --- a/ext/standard/tests/array/array_map_variation4.phpt +++ b/ext/standard/tests/array/array_map_variation4.phpt @@ -61,8 +61,8 @@ $arrays = array ( array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), // array with mixed values -/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, - $fp => 'resource', 133 => "int", 444.432 => "float", +/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, + $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc") ); diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt index e286095576..55f1569211 100644 --- a/ext/standard/tests/array/array_map_variation5.phpt +++ b/ext/standard/tests/array/array_map_variation5.phpt @@ -61,8 +61,8 @@ $arrays = array ( array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values -/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", - 'resource' => $fp, "int" => 133, "float" => 444.432, +/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", + 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) ); diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 566fd95e0b..9b6ee42e2a 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - array having subarrays --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -25,12 +25,12 @@ $arr1 = array( array('a', 'b'), array(1, 2, 'a', 'b'), array(1 => 'a', 'b' => 2) -); +); 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..44ad142184 100644 --- a/ext/standard/tests/array/array_map_variation7.phpt +++ b/ext/standard/tests/array/array_map_variation7.phpt @@ -3,7 +3,7 @@ Test array_map() function : usage variations - arrays of different size --FILE-- <?php /* Prototype : array array_map ( callback $callback , array $arr1 [, array $... ] ) - * Description: Applies the callback to the elements of the given arrays + * Description: Applies the callback to the elements of the given arrays * Source code: ext/standard/array.c */ @@ -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..245f59e745 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -16,7 +16,7 @@ $begin_array = array( array( -2.44444 => 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -26,8 +26,8 @@ $end_array = array( array( "" => "string"), array( -2.44444 => 12), array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344), - array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), - array( NULL, 1.23 => "Hi", "string" => "hello", + array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), + array( NULL, 1.23 => "Hi", "string" => "hello", array("" => "World", "-2.34" => "a", "0" => "b")) ); @@ -41,22 +41,22 @@ foreach($begin_array as $first) { $result = array_merge($first, $second); print_r($result); $count_inner++; - } + } $count_outer++; } echo "\n*** Testing array_merge() with three or more arrays ***\n"; -var_dump( array_merge( $end_array[0], - $end_array[5], +var_dump( array_merge( $end_array[0], + $end_array[5], $end_array[4], $end_array[6] ) ); -var_dump( array_merge( $end_array[0], - $end_array[5], - array("array on fly"), +var_dump( array_merge( $end_array[0], + $end_array[5], + array("array on fly"), array("nullarray" => array()) ) ); @@ -64,7 +64,7 @@ var_dump( array_merge( $end_array[0], echo "\n*** Testing single array argument ***\n"; /* Empty array */ -var_dump(array_merge(array())); +var_dump(array_merge(array())); /* associative array with string keys, which will not be re-indexed */ var_dump(array_merge($begin_array[4])); @@ -86,7 +86,7 @@ var_dump(array_merge($begin_array[0], $begin_array[1], 100)); var_dump(array_merge($begin_array[0], $begin_array[1], $arr4)); echo "Done\n"; -?> +?> --EXPECTF-- *** Testing array_merge() basic functionality *** @@ -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 9836a131a9..fcf9131ed8 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_merge() function : basic functionality +Test array_merge() function : basic functionality --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -25,7 +25,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_error.phpt b/ext/standard/tests/array/array_merge_error.phpt index 38e672e32c..a017c27530 100644 --- a/ext/standard/tests/array/array_merge_error.phpt +++ b/ext/standard/tests/array/array_merge_error.phpt @@ -3,7 +3,7 @@ Test array_merge() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt index c1cf40b845..e22208753e 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_merge_recursive() function : basic functionality - array with default keys +Test array_merge_recursive() function : basic functionality - array with default keys --FILE-- <?php /* Prototype : array array_merge_recursive(array $arr1[, array $...]) - * Description: Recursively merges elements from passed arrays into one array + * Description: Recursively merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -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..ce17a06b89 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_merge_recursive() function : basic functionality - associative arrays +Test array_merge_recursive() function : basic functionality - associative arrays --FILE-- <?php /* Prototype : array array_merge_recursive(array $arr1[, array $...]) - * Description: Recursively merges elements from passed arrays into one array + * Description: Recursively merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_merge_recursive_error.phpt index ffa9cc998e..d7d717297e 100644 --- a/ext/standard/tests/array/array_merge_recursive_error.phpt +++ b/ext/standard/tests/array/array_merge_recursive_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_merge_recursive() function : error conditions +Test array_merge_recursive() function : error conditions --FILE-- <?php /* Prototype : array array_merge_recursive(array $arr1[, array $...]) - * Description: Recursively merges elements from passed arrays into one array + * Description: Recursively merges elements from passed arrays into one array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt index 1d9a3d813f..63731d2ad7 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - unexpected values for */ /* - * Passing non array values to 'arr1' argument of array_merge_recursive() and see + * Passing non array values to 'arr1' argument of array_merge_recursive() and see * that the function outputs proper warning messages wherever expected. */ @@ -82,22 +82,22 @@ $arrays = array ( /*24*/ new A() ); -// initialise the second argument +// initialise the second argument $arr2 = array(1, array("hello", 'world')); // loop through each element of $arrays and check the behavior of array_merge_recursive() $iterator = 1; foreach($arrays as $arr1) { echo "\n-- Iteration $iterator --"; - + // with default argument echo "\n-- With default argument --"; var_dump( array_merge_recursive($arr1) ); - + // with more arguments echo "-- With more arguments --"; var_dump( array_merge_recursive($arr1, $arr2) ); - + $iterator++; } @@ -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..06595d5130 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -8,21 +8,21 @@ Test array_merge_recursive() function : usage variations - two dimensional array */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * two dimensional arrays for $arr1 argument. */ echo "*** Testing array_merge_recursive() : two dimensional array for \$arr1 argument ***\n"; // initialize the 2-d array -$arr1 = array( +$arr1 = array( array(1, 2, 3, 1), "array" => array("hello", "world", "str1" => "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), array(1, 2, 3, 1) ); -// initialize the second argument +// initialize the second argument $arr2 = array(1, "hello", "array" => array("hello", 'world')); echo "-- Passing the entire 2-d array --\n"; @@ -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..64eacb784f 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - unexpected values for */ /* - * Passing non array values to 'arr2' argument of array_merge_recursive() and see + * Passing non array values to 'arr2' argument of array_merge_recursive() and see * that the function outputs proper warning messages wherever expected. */ @@ -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..8a76a67153 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -92,10 +92,10 @@ foreach($arrays as $arr1) { $iterator++; } - + 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_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index f73dd9c628..b497acec7e 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt @@ -53,7 +53,7 @@ $arrays = array ( /*8*/ array(new classA() => 11, @$unset_var => array("unset"), $fp => 'resource', 11, "hello") ); -// initialise the second array +// initialise the second array $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c")); // loop through each sub array of $arrays and check the behavior of array_merge_recursive() @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt index 34cdfe409f..3b251220ea 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt @@ -53,7 +53,7 @@ $arrays = array ( /*8*/ array(11 => new classA(), "string" => @$unset_var, "resource" => $fp, new classA(), $fp), ); -// initialise the second array +// initialise the second array $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c")); // loop through each sub array of $arrays and check the behavior of array_merge_recursive() @@ -74,7 +74,7 @@ foreach($arrays as $arr1) { // close the file resource used fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt index 56c67916c7..22819dfb37 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with duplicate */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * array having duplicate keys. */ @@ -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..419eed5d11 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with reference */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * array having reference variables. */ @@ -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..255ed070aa 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -18,7 +18,7 @@ $arr1 = array(b"1", b"hello" => "hello", b"world", "str1" => b"hello", "str2" => // initialize the second argument $arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary"); - + echo "-- With default argument --\n"; var_dump( array_merge_recursive($arr1) ); @@ -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..59a94024f1 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt @@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - common key and value( */ /* - * Testing the functionality of array_merge_recursive() by passing + * Testing the functionality of array_merge_recursive() by passing * arrays having common key and value. */ @@ -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 02c82e2320..96996edcf4 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Pass different data types to $a --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -103,87 +103,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 -- @@ -196,36 +196,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 47b06f10ba..46403fac9e 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -3,11 +3,11 @@ Test array_merge() function : usage variations - position of internal array poin --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ -/* +/* * Check the position of the internal array pointer after calling array_merge(). * This test is also passing more than two arguments to array_merge(). */ @@ -35,7 +35,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..30a405c623 100644 --- a/ext/standard/tests/array/array_merge_variation2.phpt +++ b/ext/standard/tests/array/array_merge_variation2.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Pass different data types as $a --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt index 89121dd0d0..717968adb8 100644 --- a/ext/standard/tests/array/array_merge_variation3.phpt +++ b/ext/standard/tests/array/array_merge_variation3.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - arrays of diff. data types --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -70,13 +70,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -86,7 +86,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index 24eee4c257..ad7d7fe5dc 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -3,12 +3,12 @@ Test array_merge() function : usage variations - Diff. data types as array keys --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ /* - * Pass an array with different data types as keys to test how array_merge + * Pass an array with different data types as keys to test how array_merge * adds it onto an existing array */ @@ -43,7 +43,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -52,8 +52,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -63,17 +63,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -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 d2989ea6cc..143d4ca1e6 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - numeric keys --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -24,7 +24,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 8612e8e9ab..3ddc068244 100644 --- a/ext/standard/tests/array/array_merge_variation6.phpt +++ b/ext/standard/tests/array/array_merge_variation6.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - string keys --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -24,7 +24,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 d2ddeb6a01..fedf61e96e 100644 --- a/ext/standard/tests/array/array_merge_variation7.phpt +++ b/ext/standard/tests/array/array_merge_variation7.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Mixed keys --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -24,7 +24,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 e2a02e10da..700bbb8913 100644 --- a/ext/standard/tests/array/array_merge_variation8.phpt +++ b/ext/standard/tests/array/array_merge_variation8.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - multi-dimensional arrays --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -26,7 +26,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 144f08c44b..95daa10558 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -3,7 +3,7 @@ Test array_merge() function : usage variations - referenced variables --FILE-- <?php /* Prototype : array array_merge(array $arr1, array $arr2 [, array $...]) - * Description: Merges elements from passed arrays into one array + * Description: Merges elements from passed arrays into one array * Source code: ext/standard/array.c */ @@ -34,7 +34,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 c317a1e025..7d33596630 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : basic functionality +Test array_multisort() function : basic functionality --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : basic functionality ***\n"; @@ -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 85a90f9274..682543bc9f 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : basic functionality +Test array_multisort() function : basic functionality --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : basic functionality - renumbering of numeric keys ***\n"; @@ -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..f766e5fc1d 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : case-sensitive --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : case-sensitive\n"; @@ -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_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index 7dcb5c12b5..5956630f84 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : error conditions +Test array_multisort() function : error conditions --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index c15785b69c..46d55ae065 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : case-insensitive --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : case-insensitive\n"; @@ -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..35576c481c 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting\n"; @@ -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..163819ef96 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting case-sensitive --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting case-sensitive\n"; @@ -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..1ada637f0e 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting case-insensitive --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : natural sorting case-insensitive\n"; @@ -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_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 5e84548d7e..93c265922e 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation +Test array_multisort() function : usage variation --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 34c7ad4b29..e4e9075562 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation - testing with anonymous arrary arguments +Test array_multisort() function : usage variation - testing with anonymous arrary arguments --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing with anonymous arguments ***\n"; @@ -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_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index 8c26a8347b..86210eeb49 100644 --- a/ext/standard/tests/array/array_multisort_variation2.phpt +++ b/ext/standard/tests/array/array_multisort_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation +Test array_multisort() function : usage variation --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt index 28130e31fd..b2cdb05ece 100644 --- a/ext/standard/tests/array/array_multisort_variation3.phpt +++ b/ext/standard/tests/array/array_multisort_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation +Test array_multisort() function : usage variation --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index fc123d7544..76eb9ab04b 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation - testing with multiple array arguments +Test array_multisort() function : usage variation - testing with multiple array arguments --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing with multiple array arguments ***\n"; @@ -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..66504ca798 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation - testing with multiple array arguments +Test array_multisort() function : usage variation - testing with multiple array arguments --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing all array sort specifiers ***\n"; @@ -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..81bd1d1acd 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_multisort() function : usage variation - testing with multiple array arguments +Test array_multisort() function : usage variation - testing with multiple array arguments --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : Testing all array sort specifiers ***\n"; @@ -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..996c183fcd 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; @@ -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..90c66a97cc 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; @@ -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_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt index 8d422b78c0..cc4b8d147b 100644 --- a/ext/standard/tests/array/array_multisort_variation9.phpt +++ b/ext/standard/tests/array/array_multisort_variation9.phpt @@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types --FILE-- <?php /* Prototype : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...]) - * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL + * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_multisort() : usage variation - test sort order of all types***\n"; diff --git a/ext/standard/tests/array/array_pad.phpt b/ext/standard/tests/array/array_pad.phpt index c267516730..add9b3c8e5 100644 --- a/ext/standard/tests/array/array_pad.phpt +++ b/ext/standard/tests/array/array_pad.phpt @@ -20,7 +20,7 @@ var_dump(array_pad("", 2000000, 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_pad_error.phpt b/ext/standard/tests/array/array_pad_error.phpt index d0dc9ccb7f..63b4c83bf0 100644 --- a/ext/standard/tests/array/array_pad_error.phpt +++ b/ext/standard/tests/array/array_pad_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_pad() function : error conditions +Test array_pad() function : error conditions --FILE-- <?php /* Prototype : array array_pad(array $input, int $pad_size, mixed $pad_value) - * Description: Returns a copy of input array padded with pad_value to size pad_size + * Description: Returns a copy of input array padded with pad_value to size pad_size * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt index 3fb93fa834..c4ef0f2d42 100644 --- a/ext/standard/tests/array/array_pad_variation1.phpt +++ b/ext/standard/tests/array/array_pad_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_pad() function : usage variations - unexpected values for 'input' argument +Test array_pad() function : usage variations - unexpected values for 'input' argument --FILE-- <?php /* Prototype : array array_pad(array $input, int $pad_size, mixed $pad_value) - * Description: Returns a copy of input array padded with pad_value to size pad_size + * Description: Returns a copy of input array padded with pad_value to size pad_size * Source code: ext/standard/array.c */ @@ -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..69de77ee97 100644 --- a/ext/standard/tests/array/array_pad_variation2.phpt +++ b/ext/standard/tests/array/array_pad_variation2.phpt @@ -5,7 +5,7 @@ Test array_pad() function : usage variations - unexpected values for 'pad_size' --FILE-- <?php /* Prototype : array array_pad(array $input, int $pad_size, mixed $pad_value) - * Description: Returns a copy of input array padded with pad_value to size pad_size + * Description: Returns a copy of input array padded with pad_value to size pad_size * Source code: ext/standard/array.c */ @@ -71,7 +71,7 @@ $pad_sizes = array( // object data /*21*/ new classA(), - + // undefined data /*22*/ @$undefined_var, @@ -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_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt index e948fce989..75df118220 100644 --- a/ext/standard/tests/array/array_pad_variation3.phpt +++ b/ext/standard/tests/array/array_pad_variation3.phpt @@ -3,11 +3,11 @@ Test array_pad() function : usage variations - possible values for 'pad_value' a --FILE-- <?php /* Prototype : array array_pad(array $input, int $pad_size, mixed $pad_value) - * Description: Returns a copy of input array padded with pad_value to size pad_size + * Description: Returns a copy of input array padded with pad_value to size pad_size * Source code: ext/standard/array.c */ -/* +/* * Testing array_pad() function for expected behavior by passing * different possible values for $pad_value argument. * $input and $pad_size arguments take fixed value. @@ -97,7 +97,7 @@ $pad_values = array( // unset data /*30*/ @$unset_var, - + // resource variable /*31*/ $fp, 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..2336d2a394 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -32,17 +32,17 @@ 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 "\nOutput after Pop is :\n"; var_dump( array_pop($sub_array) ); $counter++; -} +} 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_error.phpt b/ext/standard/tests/array/array_product_error.phpt index 3ef23b9210..79f7cb4a08 100644 --- a/ext/standard/tests/array/array_product_error.phpt +++ b/ext/standard/tests/array/array_product_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_product() function : error conditions +Test array_product() function : error conditions --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt index b8f2013dc3..cd2ed71ae6 100644 --- a/ext/standard/tests/array/array_product_variation1.phpt +++ b/ext/standard/tests/array/array_product_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_product() function : variation +Test array_product() function : variation --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variation - using non numeric values ***\n"; @@ -15,7 +15,7 @@ class A { } $fp = fopen(__FILE__, "r"); -$types = array("boolean (true)" => true, "boolean (false)" => false, +$types = array("boolean (true)" => true, "boolean (false)" => false, "string" => "hello", "numeric string" => "12", "resource" => $fp, "object" => new A(), "null" => null, "array" => array(3,2)); diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index 410f2c827e..79821981a0 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -3,9 +3,9 @@ Test array_product() function : variation --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations ***\n"; @@ -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 c60d47a9db..e2b5e3efe8 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -3,9 +3,9 @@ Test array_product() function : variation --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations - negative numbers***\n"; @@ -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..f2b9f2bc29 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -3,9 +3,9 @@ Test array_product() function : variation --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : variations ***\n"; @@ -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..687ea89c38 100644 --- a/ext/standard/tests/array/array_product_variation5.phpt +++ b/ext/standard/tests/array/array_product_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_product() function : usage variation +Test array_product() function : usage variation --FILE-- <?php /* Prototype : mixed array_product(array input) - * Description: Returns the product of the array entries + * Description: Returns the product of the array entries * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_product() : usage variation ***\n"; @@ -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..829100c54c 100644 --- a/ext/standard/tests/array/array_push.phpt +++ b/ext/standard/tests/array/array_push.phpt @@ -54,13 +54,13 @@ echo "\n*** 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 "\nOutput after push is :\n"; var_dump( array_push($sub_array, 22, "abc") ); $counter++; -} +} /* Checking for return value and the new array formed from push operation */ echo "\n*** Checking for return value and the new array formed from push operation ***\n"; @@ -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 8dbefbea42..ff4ab2d711 100644 --- a/ext/standard/tests/array/array_push_basic.phpt +++ b/ext/standard/tests/array/array_push_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_push() function : basic functionality +Test array_push() function : basic functionality --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -30,7 +30,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..ec866348b2 100644 --- a/ext/standard/tests/array/array_push_error1.phpt +++ b/ext/standard/tests/array/array_push_error1.phpt @@ -2,8 +2,8 @@ Test array_push() function : error conditions - Pass incorrect number of args --FILE-- <?php -/* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array +/* 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_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt index c50683b780..5d7b655a42 100644 --- a/ext/standard/tests/array/array_push_error2.phpt +++ b/ext/standard/tests/array/array_push_error2.phpt @@ -3,7 +3,7 @@ Test array_push() function : error conditions - max int value as key --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt index 9bb9c8dc84..14125fcb87 100644 --- a/ext/standard/tests/array/array_push_variation1.phpt +++ b/ext/standard/tests/array/array_push_variation1.phpt @@ -3,7 +3,7 @@ Test array_push() function : usage variations - Pass different data types as $st --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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 3a3a54c80f..9e31a7628a 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -3,7 +3,7 @@ Test array_push() function : usage variations - Pass different data types as $va --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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 e42bdada59..8b7ef48ce7 100644 --- a/ext/standard/tests/array/array_push_variation3.phpt +++ b/ext/standard/tests/array/array_push_variation3.phpt @@ -3,7 +3,7 @@ Test array_push() function : usage variations - multidimensional arrays --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -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 99b5f13336..e5024daccf 100644 --- a/ext/standard/tests/array/array_push_variation5.phpt +++ b/ext/standard/tests/array/array_push_variation5.phpt @@ -3,7 +3,7 @@ Test array_push() function : usage variations - position of internal array point --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -24,7 +24,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 60d82bff28..903a7a5ef4 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -3,7 +3,7 @@ Test array_push() function : usage variations - array keys are different data ty --FILE-- <?php /* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) - * Description: Pushes elements onto the end of the array + * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -42,7 +42,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), @@ -65,7 +65,7 @@ $inputs = array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*5*/ 'empty double quotes' => array( "" => 'emptyd', @@ -106,7 +106,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..678892b6e0 100644 --- a/ext/standard/tests/array/array_rand.phpt +++ b/ext/standard/tests/array/array_rand.phpt @@ -15,7 +15,7 @@ var_dump(array_rand(array(1,2,3), 2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d NULL @@ -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_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt index 46d265aa99..30b5b5ce9a 100644 --- a/ext/standard/tests/array/array_rand_basic1.phpt +++ b/ext/standard/tests/array/array_rand_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : basic functionality - array with default keys +Test array_rand() function : basic functionality - array with default keys --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_rand_basic2.phpt b/ext/standard/tests/array/array_rand_basic2.phpt index 4ff93c8652..e18fede4bd 100644 --- a/ext/standard/tests/array/array_rand_basic2.phpt +++ b/ext/standard/tests/array/array_rand_basic2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : basic functionality - with associative array for 'input' argument +Test array_rand() function : basic functionality - with associative array for 'input' argument --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ @@ -16,7 +16,7 @@ echo "*** Testing array_rand() : with associative array ***\n"; // Initialise the 'input' and 'num_req' variables $input = array( - 'one' => 1, 'two' => 2, 'three' => 3, + 'one' => 1, 'two' => 2, 'three' => 3, 'FoUr' => 'four', '#5' => 5, 'SIX' => 'six', "seven" => 7, "#8" => "eight", "nine" => "NINE" ); diff --git a/ext/standard/tests/array/array_rand_error.phpt b/ext/standard/tests/array/array_rand_error.phpt index 2ffae12178..30cc85ae6c 100644 --- a/ext/standard/tests/array/array_rand_error.phpt +++ b/ext/standard/tests/array/array_rand_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : error conditions +Test array_rand() function : error conditions --FILE-- <?php /* Prototype : mixed array_rand(array input [, int num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt index 0243973944..1847e60dc6 100644 --- a/ext/standard/tests/array/array_rand_variation1.phpt +++ b/ext/standard/tests/array/array_rand_variation1.phpt @@ -3,7 +3,7 @@ Test array_rand() function : usage variations - unexpected values for 'input' pa --FILE-- <?php /* Prototype : mixed array_rand(array input [, int num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ @@ -28,7 +28,7 @@ $fp = fopen(__FILE__, "r"); class test { var $t = 10; - function __toString() + function __toString() { return "object"; } @@ -48,8 +48,8 @@ $values = array( -10.5, 12.3456789000e10, 12.3456789000E-10, - .5, - + .5, + // null data /*10*/ NULL, null, @@ -81,14 +81,14 @@ $values = array( /*23*/ @$unset_var, ); -/* loop through each element of the array to test array_rand() function +/* loop through each element of the array to test array_rand() function * for different values for 'input' argument */ $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; var_dump( array_rand($value,$num_req) ); - $count++; + $count++; }; // closing the resource @@ -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 250370fef8..44967ffd8c 100644 --- a/ext/standard/tests/array/array_rand_variation2.phpt +++ b/ext/standard/tests/array/array_rand_variation2.phpt @@ -5,7 +5,7 @@ Test array_rand() function : usage variations - unexpected values for 'num_req' --FILE-- <?php /* Prototype : mixed array_rand(array input [, int num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ @@ -82,7 +82,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - var_dump( array_rand($input,$value) ); + var_dump( array_rand($input,$value) ); $count++; }; @@ -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_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt index 6c656ef55e..81194a135d 100644 --- a/ext/standard/tests/array/array_rand_variation3.phpt +++ b/ext/standard/tests/array/array_rand_variation3.phpt @@ -1,14 +1,14 @@ --TEST-- -Test array_rand() function : usage variation - with MultiDimensional array +Test array_rand() function : usage variation - with MultiDimensional array --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ /* -* Test behaviour of array_rand() function when multi-dimensional array +* Test behaviour of array_rand() function when multi-dimensional array * is passed to 'input' argument */ @@ -20,12 +20,12 @@ $input = array( /*1*/ array(1, 2, 0, -0, -1, -2), // array with float values - array(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2), - - // array with single quoted strings + array(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2), + + // array with single quoted strings /*3*/ array('one', '123numbers', 'hello\tworld', 'hello world\0', '12.34floatnum'), - // array with double quoted strings + // array with double quoted strings array("one","123numbers", "hello\tworld", "hello world\0", "12.34floatnum"), // array with bool values @@ -33,7 +33,7 @@ $input = array( // array with hexa values array(0x123, -0x123, 0xabc, 0xABC, 0xab), - + // array with null values /*7*/ array(null, NULL, "\0", Null, NuLl) diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt index 27f1620003..74dada0aa0 100644 --- a/ext/standard/tests/array/array_rand_variation4.phpt +++ b/ext/standard/tests/array/array_rand_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_rand() function : usage variation - with associative arrays for 'input' parameter +Test array_rand() function : usage variation - with associative arrays for 'input' parameter --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ @@ -16,12 +16,12 @@ echo "*** Testing array_rand() : with associative arrays ***\n"; // initialise associative arrays $asso_arrays = array( - + // array with numeric keys /*1*/ array(1 => 'one', 2 => 2, 1234567890 => 'big', -1 => 'negative key', 2.3 => 'float key', 0 => "zero key", 0.2 => 'decimal key', 2e2 => 'exp key1', -2e3 => 'negative exp key'), - + // array with string keys array('one' => 1, "two" => 2.0, "three" => 'three', '12twelve' => 12.00, "" => 'empty string', " " => "space key"), @@ -29,7 +29,7 @@ $asso_arrays = array( // array with hexa values as keys /*3*/ array(0xabc => 2748, 0x12f => '303', 0xff => "255", -0xff => "-255"), - // array with octal values as keys + // array with octal values as keys array(0123 => 83, 012 => 10, 010 => "8", -034 => "-28", 0012 => '10'), // array with bool values as keys @@ -42,7 +42,7 @@ $asso_arrays = array( "\t" => "tab as key", "'" => 'single quote as key', '"' => 'double quote as key', "\0" => "null char as key") ); - + /* looping to test array_rand() function with different arrays having * different types of keys */ @@ -59,10 +59,10 @@ foreach($asso_arrays as $input) { var_dump( array_rand($input, 1) ); // with $num_req=1 echo"\nWith num_req = 2\n"; var_dump( array_rand($input, 2) ); // with $num_req=2 - + $counter++; } // end of for loop - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 7c4043e464..44f5cd8573 100644 --- a/ext/standard/tests/array/array_rand_variation5.phpt +++ b/ext/standard/tests/array/array_rand_variation5.phpt @@ -3,13 +3,13 @@ Test array_rand() function : usage variation - invalid values for 'req_num' para --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ /* -* Test behaviour of array_rand() function when associative array and -* various invalid values are passed to the 'input' and 'req_num' +* Test behaviour of array_rand() function when associative array and +* various invalid values are passed to the 'input' and 'req_num' * parameters respectively */ @@ -22,9 +22,9 @@ $input = array( 0xabc => 2748, 0x12f => '303', 0xff => "255", 0123 => 83, 012 => 10, 010 => "8" ); - + // Testing array_rand() function with various invalid 'req_num' values -// with valid num_req values +// with valid num_req values echo"\n-- With default num_req value --\n"; var_dump( array_rand($input) ); // with default $num_req value echo"\n-- With num_req = 1 --\n"; @@ -39,7 +39,7 @@ echo"\n-- With num_req = -2 --\n"; var_dump( array_rand($input, -2) ); // with $num_req=-2 echo"\n-- With num_req more than number of members in 'input' array --\n"; var_dump( array_rand($input, 13) ); // with $num_req=13 - + echo "Done"; ?> diff --git a/ext/standard/tests/array/array_rand_variation6.phpt b/ext/standard/tests/array/array_rand_variation6.phpt index d60630eb32..3f1fea28cd 100644 --- a/ext/standard/tests/array/array_rand_variation6.phpt +++ b/ext/standard/tests/array/array_rand_variation6.phpt @@ -3,7 +3,7 @@ Test array_rand() function : usage variation - with heredoc string as key in the --FILE-- <?php /* Prototype : mixed array_rand(array $input [, int $num_req]) - * Description: Return key/keys for random entry/entries in the array + * Description: Return key/keys for random entry/entries in the array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt index 1ec9885da8..9d702ebce0 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -36,8 +36,8 @@ $initial = null; 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_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt index 88070dee55..954aa43d76 100644 --- a/ext/standard/tests/array/array_reduce_error.phpt +++ b/ext/standard/tests/array/array_reduce_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_reduce() function : error conditions +Test array_reduce() function : error conditions --FILE-- <?php /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) - * Description: Iteratively reduce the array to a single value via the callback. + * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index 96268f6605..e4bbea8bf0 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_reduce() function : variation +Test array_reduce() function : variation --FILE-- <?php /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) - * Description: Iteratively reduce the array to a single value via the callback. + * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation ***\n"; @@ -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_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt index 853ceb946b..35b2d38f40 100644 --- a/ext/standard/tests/array/array_reduce_variation2.phpt +++ b/ext/standard/tests/array/array_reduce_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_reduce() function : variation - invalid parameters +Test array_reduce() function : variation - invalid parameters --FILE-- <?php /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) - * Description: Iteratively reduce the array to a single value via the callback. + * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation - invalid parameters ***\n"; diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index 87b0c3ae9b..a359d425db 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_reduce() function : variation - object callbacks +Test array_reduce() function : variation - object callbacks --FILE-- <?php /* Prototype : mixed array_reduce(array input, mixed callback [, int initial]) - * Description: Iteratively reduce the array to a single value via the callback. + * Description: Iteratively reduce the array to a single value via the callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_reduce() : variation - object callbacks ***\n"; @@ -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..abca4e4ae5 100644 --- a/ext/standard/tests/array/array_reverse_basic1.phpt +++ b/ext/standard/tests/array/array_reverse_basic1.phpt @@ -3,12 +3,12 @@ Test array_reverse() function : basic functionality - simple array for 'array' a --FILE-- <?php /* Prototype : array array_reverse(array $array [, bool $preserve_keys]) - * Description: Return input as a new array with the order of the entries reversed + * Description: Return input as a new array with the order of the entries reversed * Source code: ext/standard/array.c */ /* - * Testing array_reverse() by giving a simple array for $array argument + * Testing array_reverse() by giving a simple array for $array argument */ echo "*** Testing array_reverse() : basic functionality ***\n"; @@ -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..88a62b8573 100644 --- a/ext/standard/tests/array/array_reverse_basic2.phpt +++ b/ext/standard/tests/array/array_reverse_basic2.phpt @@ -3,7 +3,7 @@ Test array_reverse() function : basic functionality - associative array for 'arr --FILE-- <?php /* Prototype : array array_reverse(array $array [, bool $preserve_keys]) - * Description: Return input as a new array with the order of the entries reversed + * Description: Return input as a new array with the order of the entries reversed * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_reverse_error.phpt index bfa9c5130b..faf7e8243f 100644 --- a/ext/standard/tests/array/array_reverse_error.phpt +++ b/ext/standard/tests/array/array_reverse_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_reverse() function : error conditions +Test array_reverse() function : error conditions --FILE-- <?php /* Prototype : array array_reverse(array $array [, bool $preserve_keys]) - * Description: Return input as a new array with the order of the entries reversed + * Description: Return input as a new array with the order of the entries reversed * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt index 82c797e5fe..70c5d5fa3d 100644 --- a/ext/standard/tests/array/array_reverse_variation1.phpt +++ b/ext/standard/tests/array/array_reverse_variation1.phpt @@ -58,12 +58,12 @@ $arrays = array ( // empty data /*16*/ "", '', - + // string data 'Hello world', "Hello world", $heredoc_string, - + // object data /*21*/ new classA(), @@ -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_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index 88f36ea025..e3f0254f52 100644 --- a/ext/standard/tests/array/array_reverse_variation4.phpt +++ b/ext/standard/tests/array/array_reverse_variation4.phpt @@ -43,18 +43,18 @@ $arrays = array ( array(0 => "0"), array(1 => "1"), array(1 => "1", 2 => "2", 3 => "3", 4 => "4"), - + // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", 4.89999922839999 => "f3", 33333333.333333 => "f4"), - + // arrays with string keys array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), /*8*/ array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc // array with object, unset variable and resource variable - array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), + array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), // array with mixed values /*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc") diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt index dbd316ab8a..6c4c952240 100644 --- a/ext/standard/tests/array/array_reverse_variation5.phpt +++ b/ext/standard/tests/array/array_reverse_variation5.phpt @@ -46,18 +46,18 @@ $arrays = array ( array('0' => 0), array("1" => 1), array("one" => 1, 'two' => 2, "three" => 3, 4 => 4), - + // arrays with float values /*5*/ array("float" => 2.3333), array("f1" => 1.2, 'f2' => 3.33, 3 => 4.89999922839999, 'f4' => 33333333.333333), - + // arrays with string values array(111 => "\tHello", "red" => "col\tor", 2 => "\v\fworld", 3.3 => "pen\n"), -/*8*/ array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 => 'pen\n'), +/*8*/ array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 => 'pen\n'), array(1 => "hello", "heredoc" => $heredoc), // array with object, unset variable and resource variable - array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), + array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), // array with mixed values /*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc) diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index 7c222b9286..edbefd345f 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -15,7 +15,7 @@ echo "*** Testing array_reverse() : usage variations ***\n"; // Initializing the 2-d arrays $two_dimensional_array = array( - + // associative array array('color' => 'red', 'item' => 'pen', 'place' => 'LA'), @@ -24,7 +24,7 @@ $two_dimensional_array = array( // combination of numeric and associative arrays array('a' => 'green', 'red', 'brown', 33, 88, 'orange', 'item' => 'ball') -); +); // calling array_reverse() with various types of 2-d arrays // with default arguments @@ -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..81dd55db62 100644 --- a/ext/standard/tests/array/array_search1.phpt +++ b/ext/standard/tests/array/array_search1.phpt @@ -18,11 +18,11 @@ var_dump(array_search(-1,$a, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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..094767dacd 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -19,7 +19,7 @@ $arrays = array ( array(TRUE, FALSE), array("", array()), array("abcd\x00abcd\x00abcd"), - array("abcd\tabcd\nabcd\rabcd\0abcdefghij") + array("abcd\tabcd\nabcd\rabcd\0abcdefghij") ); $array_compare = array ( @@ -49,18 +49,18 @@ foreach($arrays as $array) { foreach($array_compare as $compare) { echo "-- Iteration $counter --\n"; //strict option OFF - var_dump(array_search($compare,$array)); + var_dump(array_search($compare,$array)); //strict option ON - var_dump(array_search($compare,$array,TRUE)); + var_dump(array_search($compare,$array,TRUE)); //strict option OFF - var_dump(array_search($compare,$array,FALSE)); + var_dump(array_search($compare,$array,FALSE)); $counter++; } } - + 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..a8bac04edb 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -16,10 +16,10 @@ $misc_array = array ( 'a', 'key' =>'d', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,17 +39,17 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( array_search($type,$misc_array ) ); + var_dump( array_search($type,$misc_array ) ); //strict type checking - var_dump( array_search($type,$misc_array,true) ); + var_dump( array_search($type,$misc_array,true) ); //loose type checking - var_dump( array_search($type,$misc_array,false) ); + var_dump( array_search($type,$misc_array,false) ); $counter++; } 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_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt index 41b0b5bb20..8af089a72c 100644 --- a/ext/standard/tests/array/array_search_variation3.phpt +++ b/ext/standard/tests/array/array_search_variation3.phpt @@ -11,7 +11,7 @@ Test array_search() function : usage variations - haystack as sub-array/object /* checking for sub-arrays with array_search() */ echo "*** Testing sub-arrays with array_search() ***\n"; $sub_array = array ( - "one", + "one", array(1, 2 => "two", "three" => 3), 4 => "four", "five" => 5, @@ -19,7 +19,7 @@ $sub_array = array ( ); var_dump( array_search("four", $sub_array) ); //checking for element in a sub-array -var_dump( array_search(3, $sub_array[1]) ); +var_dump( array_search(3, $sub_array[1]) ); var_dump( array_search(array('','i'), $sub_array) ); /* checking for objects in array_search() */ @@ -33,11 +33,11 @@ class array_search_check { $array_search_obj = new array_search_check(); //creating new object //error: as wrong datatype for second argument -var_dump( array_search("array_var", $array_search_obj) ); +var_dump( array_search("array_var", $array_search_obj) ); //error: as wrong datatype for second argument -var_dump( array_search("foo", $array_search_obj) ); +var_dump( array_search("foo", $array_search_obj) ); //element found as "one" exists in array $array_var -var_dump( array_search("one", $array_search_obj->array_var) ); +var_dump( array_search("one", $array_search_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 425872afcc..95656899ce 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -20,42 +20,42 @@ $dir_handle = opendir( dirname(__FILE__) ); $resources = array($file_handle, $dir_handle); // search for resouce type in the resource array -var_dump( array_search($file_handle, $resources, true) ); +var_dump( array_search($file_handle, $resources, true) ); //checking for (int) type resource -var_dump( array_search((int)$dir_handle, $resources, true) ); +var_dump( array_search((int)$dir_handle, $resources, true) ); /* Miscellenous input check */ echo "\n*** Testing miscelleneos inputs with array_search() ***\n"; //matching "Good" in array(0,"hello"), result:true in loose type check -var_dump( array_search("Good", array(0,"hello")) ); -//false in strict mode -var_dump( array_search("Good", array(0,"hello"), TRUE) ); +var_dump( array_search("Good", array(0,"hello")) ); +//false in strict mode +var_dump( array_search("Good", array(0,"hello"), TRUE) ); //matching integer 0 in array("this"), result:true in loose type check -var_dump( array_search(0, array("this")) ); +var_dump( array_search(0, array("this")) ); // false in strict mode -var_dump( array_search(0, array("this")),TRUE ); +var_dump( array_search(0, array("this")),TRUE ); //matching string "this" in array(0), result:true in loose type check -var_dump( array_search("this", array(0)) ); +var_dump( array_search("this", array(0)) ); // false in stric mode -var_dump( array_search("this", array(0), TRUE) ); +var_dump( array_search("this", array(0), TRUE) ); //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check -var_dump( array_search(FALSE, - array("a"=> TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); +var_dump( array_search(FALSE, + array("a"=> TRUE, "b"=> TRUE, + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( array_search('123abc', array(123)) ); -var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode +var_dump( array_search('123abc', array(123)) ); +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 8e9cb97c28..e030adc2bc 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_shift() function : basic functionality +Test array_shift() function : basic functionality --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_shift_error.phpt index c44124df05..fcfb931f10 100644 --- a/ext/standard/tests/array/array_shift_error.phpt +++ b/ext/standard/tests/array/array_shift_error.phpt @@ -3,8 +3,8 @@ Test array_shift() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array - * Source code: ext/standard/array.c + * Description: Pops an element off the beginning of the array + * Source code: ext/standard/array.c */ /* diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt index 681c1169ea..cef9af8b8a 100644 --- a/ext/standard/tests/array/array_shift_variation1.phpt +++ b/ext/standard/tests/array/array_shift_variation1.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass different data types as $s --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), @@ -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_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt index 7f5d618e74..2b3adc605f 100644 --- a/ext/standard/tests/array/array_shift_variation2.phpt +++ b/ext/standard/tests/array/array_shift_variation2.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass arrays of different data t --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index a1a2697072..d3a359fab8 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass array with different data --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -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 5cc0e48c94..150f312e70 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - multi-dimensional arrays --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -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_variation5.phpt b/ext/standard/tests/array/array_shift_variation5.phpt index faae551cc2..58eab55247 100644 --- a/ext/standard/tests/array/array_shift_variation5.phpt +++ b/ext/standard/tests/array/array_shift_variation5.phpt @@ -3,14 +3,14 @@ Test array_shift() function : usage variations - call recursively --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ /* - * Use the result of one call to array_shift + * Use the result of one call to array_shift * as the $stack argument of another call to array_shift() - * When done in one statement causes strict error messages. + * When done in one statement causes strict error messages. */ echo "*** Testing array_shift() : usage variations ***\n"; diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt index 73b5de148e..1840e080d2 100644 --- a/ext/standard/tests/array/array_shift_variation6.phpt +++ b/ext/standard/tests/array/array_shift_variation6.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Referenced arrays --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -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 2d6d5070f6..02af5dd4a1 100644 --- a/ext/standard/tests/array/array_shift_variation7.phpt +++ b/ext/standard/tests/array/array_shift_variation7.phpt @@ -3,7 +3,7 @@ Test array_shift() function : usage variations - position of internal pointer --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ @@ -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_shift_variation8.phpt b/ext/standard/tests/array/array_shift_variation8.phpt index a48d907896..2f2fba5bd7 100644 --- a/ext/standard/tests/array/array_shift_variation8.phpt +++ b/ext/standard/tests/array/array_shift_variation8.phpt @@ -3,15 +3,15 @@ Test array_shift() function : usage variations - maintaining referenced elements --FILE-- <?php /* Prototype : mixed array_shift(array &$stack) - * Description: Pops an element off the beginning of the array + * Description: Pops an element off the beginning of the array * Source code: ext/standard/array.c */ /* * From a comment left by Traps on 09-Jul-2007 on the array_shift documentation page: - * For those that may be trying to use array_shift() with an array containing references - * (e.g. working with linked node trees), beware that array_shift() may not work as you expect: - * it will return a *copy* of the first element of the array, + * For those that may be trying to use array_shift() with an array containing references + * (e.g. working with linked node trees), beware that array_shift() may not work as you expect: + * it will return a *copy* of the first element of the array, * and not the element itself, so your reference will be lost. * The solution is to reference the first element before removing it with array_shift(): */ diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/array_shuffle_basic.phpt index 0bfa2e030e..fdf932605b 100644 --- a/ext/standard/tests/array/array_shuffle_basic.phpt +++ b/ext/standard/tests/array/array_shuffle_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_shuffle(): Test return type and value for expected input +array_shuffle(): Test return type and value for expected input --FILE-- <?php /* 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 8094b412da..295d9625a0 100644 --- a/ext/standard/tests/array/array_slice_basic.phpt +++ b/ext/standard/tests/array/array_slice_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_slice() function : basic functionality +Test array_slice() function : basic functionality --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -30,7 +30,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_error.phpt b/ext/standard/tests/array/array_slice_error.phpt index 94acd08a96..0e8f1c7571 100644 --- a/ext/standard/tests/array/array_slice_error.phpt +++ b/ext/standard/tests/array/array_slice_error.phpt @@ -3,7 +3,7 @@ Test array_slice() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index daed1d84fc..ccb83ccf57 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -21,7 +21,7 @@ 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 4da3564076..c2b48a94f6 100644 --- a/ext/standard/tests/array/array_slice_variation10.phpt +++ b/ext/standard/tests/array/array_slice_variation10.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - position of internal array poin --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -26,7 +26,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 20e0d34e12..2e2bfc4fc0 100644 --- a/ext/standard/tests/array/array_slice_variation11.phpt +++ b/ext/standard/tests/array/array_slice_variation11.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different data types as $i --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -61,7 +61,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -71,7 +71,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -103,22 +103,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 -- @@ -158,22 +158,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 c212039c79..1d3be8127d 100644 --- a/ext/standard/tests/array/array_slice_variation2.phpt +++ b/ext/standard/tests/array/array_slice_variation2.phpt @@ -5,7 +5,7 @@ Test array_slice() function : usage variations - Pass different data types as $o --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -153,7 +153,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 -- @@ -250,32 +250,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 b4a42eac98..32bfc045c6 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -5,7 +5,7 @@ Test array_slice() function : usage variations - Pass different data types as $l --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,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 e77fc4c5e0..40bfad3332 100644 --- a/ext/standard/tests/array/array_slice_variation4.phpt +++ b/ext/standard/tests/array/array_slice_variation4.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different data types as $p --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -60,7 +60,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -70,7 +70,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -267,7 +267,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 -- @@ -302,7 +302,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 698bd2b257..fb632c2bf9 100644 --- a/ext/standard/tests/array/array_slice_variation5.phpt +++ b/ext/standard/tests/array/array_slice_variation5.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different integers as $off --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -28,7 +28,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 84ef9b27c8..c1a673a8f7 100644 --- a/ext/standard/tests/array/array_slice_variation6.phpt +++ b/ext/standard/tests/array/array_slice_variation6.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - pass different int values as $l --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -29,7 +29,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 32f02fa055..fd0bfd822d 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - different data types as keys in --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -44,7 +44,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -53,8 +53,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -64,17 +64,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -111,7 +111,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 90d4645f49..011a50f9dd 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -3,12 +3,12 @@ Test array_slice() function : usage variations - multidimensional arrays --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ /* - * Test array_slice when passed + * Test array_slice when passed * 1. a two-dimensional array as $input argument * 2. a sub-array as $input argument */ @@ -26,7 +26,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 5fe0a7cb8e..ecd787a069 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -3,7 +3,7 @@ Test array_slice() function : usage variations - referenced variables --FILE-- <?php /* Prototype : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]]) - * Description: Returns elements specified by offset and length + * Description: Returns elements specified by offset and length * Source code: ext/standard/array.c */ @@ -30,7 +30,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_basic.phpt b/ext/standard/tests/array/array_splice_basic.phpt index 9a96ccb362..e96303d13a 100644 --- a/ext/standard/tests/array/array_splice_basic.phpt +++ b/ext/standard/tests/array/array_splice_basic.phpt @@ -2,10 +2,10 @@ Test array_splice(): basic functionality --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "*** Testing array_splice() basic operations ***\n"; echo "test truncation \n"; diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt index da385d2361..bdcd9913cf 100644 --- a/ext/standard/tests/array/array_splice_errors.phpt +++ b/ext/standard/tests/array/array_splice_errors.phpt @@ -2,10 +2,10 @@ Test array_splice() function : error conditions --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing error conditions of array_splice() ***\n"; @@ -33,7 +33,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_splice_variation1.phpt b/ext/standard/tests/array/array_splice_variation1.phpt index ecd6f67eb0..9ba94f6633 100644 --- a/ext/standard/tests/array/array_splice_variation1.phpt +++ b/ext/standard/tests/array/array_splice_variation1.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - references --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "test behaviour when input array is in a reference set\n"; diff --git a/ext/standard/tests/array/array_splice_variation2.phpt b/ext/standard/tests/array/array_splice_variation2.phpt index 42692918d1..516339c7e8 100644 --- a/ext/standard/tests/array/array_splice_variation2.phpt +++ b/ext/standard/tests/array/array_splice_variation2.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - additional parameters --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ $array=array(0,1,2); var_dump (array_splice($array,1,1,3,4,5,6,7,8,9)); diff --git a/ext/standard/tests/array/array_splice_variation3.phpt b/ext/standard/tests/array/array_splice_variation3.phpt index 9c1a7c86ab..33ec80e5a8 100644 --- a/ext/standard/tests/array/array_splice_variation3.phpt +++ b/ext/standard/tests/array/array_splice_variation3.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - lengths and offsets --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "*** array_splice() function : usage variations - lengths and offsets\n"; diff --git a/ext/standard/tests/array/array_splice_variation4.phpt b/ext/standard/tests/array/array_splice_variation4.phpt index ddd966780e..d1cc501c6b 100644 --- a/ext/standard/tests/array/array_splice_variation4.phpt +++ b/ext/standard/tests/array/array_splice_variation4.phpt @@ -2,10 +2,10 @@ Test array_splice() function : usage variations - non array replacement values --FILE-- <?php -/* +/* * proto array array_splice(array input, int offset [, int length [, array replacement]]) * Function is implemented in ext/standard/array.c -*/ +*/ function test_splice ($replacement) { diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt index 1f41dd0334..ecbc15fae6 100644 --- a/ext/standard/tests/array/array_sum_basic.phpt +++ b/ext/standard/tests/array/array_sum_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_sum() function : basic functionality +Test array_sum() function : basic functionality --FILE-- <?php /* Prototype : mixed array_sum(array &input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_sum_error.phpt index 0433fca4dc..209405d3d3 100644 --- a/ext/standard/tests/array/array_sum_error.phpt +++ b/ext/standard/tests/array/array_sum_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_sum() function : error conditions +Test array_sum() function : error conditions --FILE-- <?php /* Prototype : mixed array_sum(array &input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt index 00540d16bc..55b249616a 100644 --- a/ext/standard/tests/array/array_sum_variation1.phpt +++ b/ext/standard/tests/array/array_sum_variation1.phpt @@ -3,12 +3,12 @@ Test array_sum() function : usage variations - unexpected values for 'input' arg --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ /* -* Passing different scalar/nonscalar values as 'input' argument to array_sum() +* Passing different scalar/nonscalar values as 'input' argument to array_sum() */ echo "*** Testing array_sum() : unexpected values for 'input' ***\n"; @@ -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..e746238155 100644 --- a/ext/standard/tests/array/array_sum_variation2.phpt +++ b/ext/standard/tests/array/array_sum_variation2.phpt @@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with different integer valu --FILE-- <?php /* Prototype : mixed array_sum(array &input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ @@ -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..7f1a756bec 100644 --- a/ext/standard/tests/array/array_sum_variation3.phpt +++ b/ext/standard/tests/array/array_sum_variation3.phpt @@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with different float values --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ @@ -26,7 +26,7 @@ $float_input = array( 1.2E2, 23.4E3, -4.1E2, 0.2E2, 2.1E-2, .5E3); var_dump( array_sum($float_input) ); // Mixed float array -$float_input = array( +$float_input = array( 1.2, 0.5 -5.8, @@ -39,10 +39,10 @@ $float_input = array( ); echo "-- Mixed float array --\n"; 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..af03d7fb7b 100644 --- a/ext/standard/tests/array/array_sum_variation4.phpt +++ b/ext/standard/tests/array/array_sum_variation4.phpt @@ -3,12 +3,12 @@ Test array_sum() function : usage variations - array with duplicate values --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ /* -* Checking array_sum() with integer and float array containing duplicate values +* Checking array_sum() with integer and float array containing duplicate values */ echo "*** Testing array_sum() : array with duplicate values ***\n"; @@ -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..ee1c186c18 100644 --- a/ext/standard/tests/array/array_sum_variation5.phpt +++ b/ext/standard/tests/array/array_sum_variation5.phpt @@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with reference variables as --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ @@ -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..950f2e2a20 100644 --- a/ext/standard/tests/array/array_sum_variation6.phpt +++ b/ext/standard/tests/array/array_sum_variation6.phpt @@ -1,14 +1,14 @@ --TEST-- -Test array_sum() function : usage variations - associative array +Test array_sum() function : usage variations - associative array --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ /* -* Testing array_sum() with associative array as 'input' argument +* Testing array_sum() with associative array as 'input' argument */ echo "*** Testing array_sum() : with associative array ***\n"; @@ -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..fbc426902f 100644 --- a/ext/standard/tests/array/array_sum_variation7.phpt +++ b/ext/standard/tests/array/array_sum_variation7.phpt @@ -3,7 +3,7 @@ Test array_sum() function : usage variations - 'input' array with unexpected val --FILE-- <?php /* Prototype : mixed array_sum(array $input) - * Description: Returns the sum of the array entries + * Description: Returns the sum of the array entries * Source code: ext/standard/array.c */ @@ -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_basic.phpt b/ext/standard/tests/array/array_udiff_assoc_basic.phpt index 26c4f31761..d115bcc326 100644 --- a/ext/standard/tests/array/array_udiff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_udiff_assoc(): Test return type and value for expected input +array_udiff_assoc(): Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_udiff_assoc_error.phpt b/ext/standard/tests/array/array_udiff_assoc_error.phpt index ae7c3b9586..ec1cc062ed 100644 --- a/ext/standard/tests/array/array_udiff_assoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : error conditions +Test array_udiff_assoc() function : error conditions --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index 9528cf69cd..f824244f6f 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : variation +Test array_udiff_assoc() function : variation --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : variation - testing with multiple array arguments ***\n"; @@ -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..108d2a3ff0 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : usage variation +Test array_udiff_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; @@ -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..d022a4e82f 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : usage variation +Test array_udiff_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt index 0f4da2c29d..e693afff87 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : usage variation +Test array_udiff_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt index 375b35915f..c5634dbcd7 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : usage variation +Test array_udiff_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_assoc() : usage variation ***\n"; @@ -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..5eb21cd723 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_assoc() function : usage variation - incorrect comparison functions +Test array_udiff_assoc() function : usage variation - incorrect comparison functions --FILE-- <?php /* Prototype : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ @@ -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_basic.phpt b/ext/standard/tests/array/array_udiff_basic.phpt index f5348852bf..5dbece34cc 100644 --- a/ext/standard/tests/array/array_udiff_basic.phpt +++ b/ext/standard/tests/array/array_udiff_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_udiff():Test return type and value for expected input +array_udiff():Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_udiff_error.phpt b/ext/standard/tests/array/array_udiff_error.phpt index 7eb7e3b068..dc9657756e 100644 --- a/ext/standard/tests/array/array_udiff_error.phpt +++ b/ext/standard/tests/array/array_udiff_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : error conditions +Test array_udiff() function : error conditions --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt index 9f7e179498..51b4bc1759 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_udiff_uassoc(): Test return type and value for expected input +array_udiff_uassoc(): Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_udiff_uassoc_error.phpt b/ext/standard/tests/array/array_udiff_uassoc_error.phpt index 76dbf16dba..e7d27e65db 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : error conditions +Test array_udiff_uassoc() function : error conditions --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index e5c95c6661..e55a600e48 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index af066b70bf..73edbfe0bb 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt index bf19c533cb..76afda098b 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt index 7be89f4c6f..0beb15ff77 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt index ccfb9e8712..f78261a1eb 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation ***\n"; @@ -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..f8ca5300ca 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff_uassoc() function : usage variation +Test array_udiff_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff_uassoc() : usage variation - differing comparison functions***\n"; @@ -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 4c0824d9bc..b32324a2dd 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : usage variation +Test array_udiff() function : usage variation --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; @@ -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===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index 40954dca67..4281ffcd18 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : usage variation +Test array_udiff() function : usage variation --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_udiff_variation3.phpt index 294686b22a..aeeee89bf1 100644 --- a/ext/standard/tests/array/array_udiff_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : usage variation +Test array_udiff() function : usage variation --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt index 1968312ce2..1048c82cc1 100644 --- a/ext/standard/tests/array/array_udiff_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : usage variation +Test array_udiff() function : usage variation --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; @@ -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..a391cb4eb6 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_udiff() function : usage variation +Test array_udiff() function : usage variation --FILE-- <?php /* Prototype : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func) - * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. + * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_udiff() : usage variation ***\n"; @@ -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_basic.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt index a7e313ecf7..d3645c7cea 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_uintersect_assoc(): Test return type and value for expected input +array_uintersect_assoc(): Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index 6a54b3bfc7..076dbf16fb 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : basic functionality - testing with mult /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments ***\n"; @@ -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_error.phpt b/ext/standard/tests/array/array_uintersect_assoc_error.phpt index d27f9f7606..73fc61e397 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : error conditions +Test array_uintersect_assoc() function : error conditions --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index f9d6249d81..634d036464 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : usage variation +Test array_uintersect_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; @@ -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..eed4afa6be 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : usage variation +Test array_uintersect_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt index 29d2694ddb..a76fca0f5c 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : usage variation +Test array_uintersect_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt index 6729a78d7b..0c8973f084 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : usage variation +Test array_uintersect_assoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) * Description: U * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation ***\n"; @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index 07b9259c8c..802934b37d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_assoc() function : usage variation - differing comparison functions +Test array_uintersect_assoc() function : usage variation - differing comparison functions --FILE-- <?php /* Prototype : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_assoc() : usage variation - differing comparison functions***\n"; @@ -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_basic.phpt b/ext/standard/tests/array/array_uintersect_basic.phpt index 5334b1da85..4965d599ba 100644 --- a/ext/standard/tests/array/array_uintersect_basic.phpt +++ b/ext/standard/tests/array/array_uintersect_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_uintersect(): Test return type and value for expected input +array_uintersect(): Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_uintersect_error.phpt b/ext/standard/tests/array/array_uintersect_error.phpt index 3c7696108a..1b25db4345 100644 --- a/ext/standard/tests/array/array_uintersect_error.phpt +++ b/ext/standard/tests/array/array_uintersect_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : error conditions +Test array_uintersect() function : error conditions --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt index a9d3f14adf..5e1ea1a7d9 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -array_uintersect_uassoc(): Test return type and value for expected input +array_uintersect_uassoc(): Test return type and value for expected input --FILE-- <?php /* diff --git a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt index bdf503c9ed..c7391eeda9 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : error conditions +Test array_uintersect_uassoc() function : error conditions --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : error conditions ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index e6709f364d..de0f4ebeb5 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation +Test array_uintersect_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; @@ -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..ffe8ccfd9a 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation +Test array_uintersect_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt index 16ffec717f..860a1661a6 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation +Test array_uintersect_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt index ce7eb49a64..a3963184c3 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation +Test array_uintersect_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt index c46a036d19..432f1c5a44 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation +Test array_uintersect_uassoc() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation ***\n"; @@ -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..782821f4a7 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect_uassoc() function : usage variation - incorrect callbacks +Test array_uintersect_uassoc() function : usage variation - incorrect callbacks --FILE-- <?php /* Prototype : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks ***\n"; @@ -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..c26ace67df 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : usage variation +Test array_uintersect() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; @@ -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..ed34d69a1c 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : usage variation +Test array_uintersect() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; @@ -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_variation3.phpt b/ext/standard/tests/array/array_uintersect_variation3.phpt index a4f670addb..707ba113c8 100644 --- a/ext/standard/tests/array/array_uintersect_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : usage variation +Test array_uintersect() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt index efff02389d..7ecf7a6395 100644 --- a/ext/standard/tests/array/array_uintersect_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : usage variation +Test array_uintersect() function : usage variation --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation ***\n"; @@ -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..04051dbf5e 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test array_uintersect() function : usage variation - differing comparison functions +Test array_uintersect() function : usage variation - differing comparison functions --FILE-- <?php /* Prototype : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func) - * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. + * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing array_uintersect() : usage variation - differing comparison functions***\n"; @@ -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..91532db8c7 100644 --- a/ext/standard/tests/array/array_unique_basic.phpt +++ b/ext/standard/tests/array/array_unique_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_unique() function : basic functionality +Test array_unique() function : basic functionality --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/array_unique_error.phpt index 256dd63ba3..9da3dfcad6 100644 --- a/ext/standard/tests/array/array_unique_error.phpt +++ b/ext/standard/tests/array/array_unique_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_unique() function : error conditions +Test array_unique() function : error conditions --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt index 9fe882b4b2..de65d0cf35 100644 --- a/ext/standard/tests/array/array_unique_variation1.phpt +++ b/ext/standard/tests/array/array_unique_variation1.phpt @@ -3,12 +3,12 @@ Test array_unique() function : usage variations - unexpected values for 'input' --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ /* - * Passing non array values to 'input' argument of array_unique() and see + * Passing non array values to 'input' argument of array_unique() and see * that the function outputs proper warning messages wherever expected. */ @@ -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..470cd284d0 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - different arrays for 'input' a --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ @@ -77,10 +77,10 @@ foreach($inputs as $input) { var_dump( array_unique($input, SORT_STRING) ); $iterator++; } - + 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_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index 95cd1887d1..49103c8154 100644 --- a/ext/standard/tests/array/array_unique_variation3.phpt +++ b/ext/standard/tests/array/array_unique_variation3.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ @@ -62,7 +62,7 @@ foreach($inputs as $input) { } fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt index 752ebf54ea..a1fc13e94d 100644 --- a/ext/standard/tests/array/array_unique_variation4.phpt +++ b/ext/standard/tests/array/array_unique_variation4.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ @@ -62,7 +62,7 @@ foreach($inputs as $input) { } fclose($fp); - + echo "Done"; ?> --EXPECTF-- diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt index bb69f2e9c7..acb94b4db0 100644 --- a/ext/standard/tests/array/array_unique_variation5.phpt +++ b/ext/standard/tests/array/array_unique_variation5.phpt @@ -3,12 +3,12 @@ Test array_unique() function : usage variations - array with duplicate keys --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ /* - * Testing the functionality of array_unique() by passing + * Testing the functionality of array_unique() by passing * array having duplicate keys as values. */ @@ -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..65bdb421a5 100644 --- a/ext/standard/tests/array/array_unique_variation6.phpt +++ b/ext/standard/tests/array/array_unique_variation6.phpt @@ -3,12 +3,12 @@ Test array_unique() function : usage variations - array with reference variables --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ /* - * Testing the functionality of array_unique() by passing + * Testing the functionality of array_unique() by passing * array having reference variables as values. */ @@ -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..4135f98d97 100644 --- a/ext/standard/tests/array/array_unique_variation7.phpt +++ b/ext/standard/tests/array/array_unique_variation7.phpt @@ -3,7 +3,7 @@ Test array_unique() function : usage variations - binary safe checking --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ @@ -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_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt index d8a318dd93..8b67adfbab 100644 --- a/ext/standard/tests/array/array_unique_variation8.phpt +++ b/ext/standard/tests/array/array_unique_variation8.phpt @@ -3,19 +3,19 @@ Test array_unique() function : usage variations - two dimensional arrays --FILE-- <?php /* Prototype : array array_unique(array $input) - * Description: Removes duplicate values from array + * Description: Removes duplicate values from array * Source code: ext/standard/array.c */ /* - * Testing the functionality of array_unique() by passing + * Testing the functionality of array_unique() by passing * two dimensional arrays for $input argument. */ echo "*** Testing array_unique() : two dimensional array for \$input argument ***\n"; // initialize the 2-d array -$input = array( +$input = array( array(1, 2, 3, 1), array("hello", "world", "str1" => "hello", "str2" => 'world'), array(1 => "one", 2 => "two", "one", 'two'), 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.phpt b/ext/standard/tests/array/array_unshift.phpt index 9b474277a9..ebcf19041f 100644 --- a/ext/standard/tests/array/array_unshift.phpt +++ b/ext/standard/tests/array/array_unshift.phpt @@ -14,7 +14,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(1) array(1) { [0]=> diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 7a0b7ba3b2..c041a47756 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -3,11 +3,11 @@ Test array_unshift() function : basic functionality - array with default keys fo --FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) - * Description: Pushes elements onto the beginning of the array + * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ -/* +/* * Testing array_unshift() by giving array with default keys for $array argument */ @@ -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 b8576ddcd9..eec6412042 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -3,11 +3,11 @@ Test array_unshift() function : basic functionality - associative arrays for 'ar --FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) - * Description: Pushes elements onto the beginning of the array + * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ -/* +/* * Testing array_unshift() by giving associative arrays for $array argument */ @@ -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..3eeb3eb750 100644 --- a/ext/standard/tests/array/array_unshift_error.phpt +++ b/ext/standard/tests/array/array_unshift_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_unshift() function : error conditions +Test array_unshift() function : error conditions --FILE-- <?php -/* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) - * Description: Pushes elements onto the beginning of the array +/* 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_object.phpt b/ext/standard/tests/array/array_unshift_object.phpt index 856c4ed85a..e6155373dd 100644 --- a/ext/standard/tests/array/array_unshift_object.phpt +++ b/ext/standard/tests/array/array_unshift_object.phpt @@ -8,7 +8,7 @@ Test array_unshift() function : passing object for 'var' argument */ /* - * Testing the functionality of array_unshift() by passing + * Testing the functionality of array_unshift() by passing * an object to the $var argument */ diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt index cb4ac0bd7b..f1301e0293 100644 --- a/ext/standard/tests/array/array_unshift_variation1.phpt +++ b/ext/standard/tests/array/array_unshift_variation1.phpt @@ -3,7 +3,7 @@ Test array_unshift() function : usage variations - unexpected values for 'array' --FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) - * Description: Pushes elements onto the beginning of the array + * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ @@ -91,7 +91,7 @@ foreach($arrays as $array) { echo "\n-- Iteration $iterator --"; /* with default arguments */ - // returns element count in the resulting array after arguments are pushed to + // returns element count in the resulting array after arguments are pushed to // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var) ); @@ -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_variation2.phpt b/ext/standard/tests/array/array_unshift_variation2.phpt index 8339043dd4..064309b53f 100644 --- a/ext/standard/tests/array/array_unshift_variation2.phpt +++ b/ext/standard/tests/array/array_unshift_variation2.phpt @@ -3,7 +3,7 @@ Test array_unshift() function : usage variations - all possible values for 'var' --FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) - * Description: Pushes elements onto the beginning of the array + * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ @@ -16,7 +16,7 @@ echo "*** Testing array_unshift() : all possible values for \$var argument ***\n // array to be passed to $array argument $array = array('f' => "first", "s" => 'second', 1, 2.222); -// get a class +// get a class class classA { public function __toString() { @@ -44,7 +44,7 @@ $vars = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, @@ -58,7 +58,7 @@ $vars = array( array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, @@ -68,7 +68,7 @@ $vars = array( false, TRUE, FALSE, - + // empty data /*21*/ "", '', @@ -86,7 +86,7 @@ $vars = array( // unset data @$unset_var, - + // resource variable /*29*/ $fp ); @@ -103,7 +103,7 @@ foreach($vars as $var) { var_dump( array_unshift($temp_array, $var) ); // dump the resulting array - var_dump($temp_array); + var_dump($temp_array); /* with optional arguments */ // returns element count in the resulting array after arguments are pushed to diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt index fa4f6b5853..9e955f7ca0 100644 --- a/ext/standard/tests/array/array_unshift_variation3.phpt +++ b/ext/standard/tests/array/array_unshift_variation3.phpt @@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - different array values for 'a */ /* - * Testing the behavior of array_unshift() by passing different types of arrays + * Testing the behavior of array_unshift() by passing different types of arrays * to $array argument to which the $var arguments will be prepended */ @@ -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_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index 64bf3a8d82..25c9159a11 100644 --- a/ext/standard/tests/array/array_unshift_variation4.phpt +++ b/ext/standard/tests/array/array_unshift_variation4.phpt @@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - assoc. array with diff. keys */ /* - * Testing the functionality of array_unshift() by passing different + * Testing the functionality of array_unshift() by passing different * associative arrays having different possible keys to $array argument. * The $var argument passed is a fixed value */ @@ -52,13 +52,13 @@ $arrays = array ( // arrays with float keys /*5*/ array(2.3333 => "float"), array(1.2 => "f1", 3.33 => "f2", - 4.89999922839999 => "f3", + 4.89999922839999 => "f3", 33333333.333333 => "f4"), // arrays with string keys /*7*/ array('\tHello' => 111, 're\td' => "color", '\v\fworld' => 2.2, 'pen\n' => 33), - array("\tHello" => 111, "re\td" => "color", + array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33), array("hello", $heredoc => "string"), // heredoc diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt index 0cc3064864..7f083694af 100644 --- a/ext/standard/tests/array/array_unshift_variation5.phpt +++ b/ext/standard/tests/array/array_unshift_variation5.phpt @@ -2,7 +2,7 @@ Test array_unshift() function : usage variations - assoc. array with diff values for 'array' argument --INI-- precision=12 ---FILE-- +--FILE-- <?php /* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) * Description: Pushes elements onto the beginning of the array @@ -14,11 +14,11 @@ precision=12 * associative arrays having different possible values to $array argument. * The $var argument passed is a fixed value */ - + echo "*** Testing array_unshift() : associative array with different values ***\n"; // get an unset variable -$unset_var = 10; +$unset_var = 10; unset ($unset_var); // get a resource variable @@ -74,7 +74,7 @@ foreach($arrays as $array) { /* with default argument */ // returns element count in the resulting array after arguments are pushed to - // beginning of the given array + // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var) ); @@ -83,7 +83,7 @@ foreach($arrays as $array) { /* with optional arguments */ // returns element count in the resulting array after arguments are pushed to - // beginning of the given array + // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt index 62a83929a2..1660442094 100644 --- a/ext/standard/tests/array/array_unshift_variation6.phpt +++ b/ext/standard/tests/array/array_unshift_variation6.phpt @@ -10,7 +10,7 @@ Test array_unshift() function : usage variations - two dimensional arrays for 'a /* * Testing the functionality of array_unshift() by giving two-dimensional * arrays and also sub-arrays within the two-dimensional array for $array argument. - * The $var argument passed is a fixed value + * The $var argument passed is a fixed value */ echo "*** Testing array_unshift() : two dimensional arrays for \$array argument ***\n"; @@ -43,7 +43,7 @@ var_dump( array_unshift($temp_array, $var) ); // whole 2-d array var_dump($temp_array); /* With optional arguments */ -// returns element count in the resulting array after arguments are pushed to +// returns element count in the resulting array after arguments are pushed to // beginning of the given array $temp_array = $two_dimensional_array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); // whole 2-d array @@ -63,7 +63,7 @@ var_dump( array_unshift($temp_array, $var) ); // sub array var_dump($temp_array); /* With optional arguments */ -// returns element count in the resulting array after arguments are pushed to +// returns element count in the resulting array after arguments are pushed to // beginning of the given array $temp_array = $two_dimensional_array[0]; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); // sub array @@ -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..a54e2ce9f5 100644 --- a/ext/standard/tests/array/array_unshift_variation7.phpt +++ b/ext/standard/tests/array/array_unshift_variation7.phpt @@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - double quoted strings for 'va /* * Testing the functionality of array_unshift() by passing different - * double quoted strings for $var argument that is prepended to the array + * double quoted strings for $var argument that is prepended to the array * passed through $array argument */ @@ -37,7 +37,7 @@ foreach($vars as $var) { // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); @@ -46,7 +46,7 @@ foreach($vars as $var) { // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); - + // dump the resulting array var_dump($temp_array); $iterator++; @@ -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..a184ec44c2 100644 --- a/ext/standard/tests/array/array_unshift_variation8.phpt +++ b/ext/standard/tests/array/array_unshift_variation8.phpt @@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - single quoted strings for 'va /* * Testing the functionality of array_unshift() by passing different - * single quoted strings for $var argument that is prepended to the array + * single quoted strings for $var argument that is prepended to the array * passed through $array argument */ @@ -32,12 +32,12 @@ $iterator = 1; foreach($vars as $var) { echo "-- Iteration $iterator --\n"; $temp_array = $array; // assign $array to another temporary $temp_array - + /* with default argument */ // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); @@ -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..89d867df92 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - heredoc strings for 'var' arg /* * Testing the functionality of array_unshift() by passing different - * heredoc strings for $var argument that is prepended to the array + * heredoc strings for $var argument that is prepended to the array * passed through $array argument */ @@ -18,13 +18,13 @@ echo "*** Testing array_unshift() : heredoc strings for \$var argument ***\n"; // heredoc with empty value $empty_string = <<<EOT EOT; - + // heredoc with blank line $blank_line = <<<EOT EOT; - + // heredoc with multiline string $multiline_string = <<<EOT hello world @@ -77,7 +77,7 @@ foreach($vars as $var) { // returns element count in the resulting array after arguments are pushed to // beginning of the given array var_dump( array_unshift($temp_array, $var) ); - + // dump the resulting array var_dump($temp_array); @@ -86,7 +86,7 @@ foreach($vars as $var) { // beginning of the given array $temp_array = $array; var_dump( array_unshift($temp_array, $var, "hello", 'world') ); - + // dump the resulting array var_dump($temp_array); $iterator++; @@ -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..ba24e90eb5 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 d155c6e128..a26a767b40 100644 --- a/ext/standard/tests/array/array_values_basic.phpt +++ b/ext/standard/tests/array/array_values_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_values() function : basic functionality +Test array_values() function : basic functionality --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -23,7 +23,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_error.phpt b/ext/standard/tests/array/array_values_error.phpt index 40256185a1..07d682c9e1 100644 --- a/ext/standard/tests/array/array_values_error.phpt +++ b/ext/standard/tests/array/array_values_error.phpt @@ -3,7 +3,7 @@ Test array_values() function : error conditions - Pass incorrect number of funct --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt index 5f88f9aa8d..82e5e04956 100644 --- a/ext/standard/tests/array/array_values_errors.phpt +++ b/ext/standard/tests/array/array_values_errors.phpt @@ -16,7 +16,7 @@ var_dump( array_values(new stdclass) ); // object echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d @@ -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_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt index 15eb77dac0..15da1a621e 100644 --- a/ext/standard/tests/array/array_values_variation.phpt +++ b/ext/standard/tests/array/array_values_variation.phpt @@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) ); echo "\n*** Testing array_values() with range checking ***\n"; $arr_range = array( - 2147483647, - 2147483648, + 2147483647, + 2147483648, -2147483647, -2147483648, -0, @@ -35,7 +35,7 @@ var_dump( array_values(array()) ); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index eb1ff7aef7..ba6649695d 100644 --- a/ext/standard/tests/array/array_values_variation1.phpt +++ b/ext/standard/tests/array/array_values_variation1.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - Pass different data types as $ --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -100,22 +100,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 -- @@ -155,22 +155,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_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt index 81e575494b..c7e9ad3f71 100644 --- a/ext/standard/tests/array/array_values_variation2.phpt +++ b/ext/standard/tests/array/array_values_variation2.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - arrays of different data types --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -66,13 +66,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -82,7 +82,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 5afa0d2c42..d036cfdebe 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - array keys different data type --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e10 => 'large', 12.3456789000E-10 => 'small', @@ -49,8 +49,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -103,7 +103,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 9f23dac1ed..3fac7b44c9 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - multi-dimensional arrays --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -32,7 +32,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 96d4bd00e4..4fc4b011cf 100644 --- a/ext/standard/tests/array/array_values_variation5.phpt +++ b/ext/standard/tests/array/array_values_variation5.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - internal array pointer --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -26,7 +26,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 9b9e182424..b4ead80b3e 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - Referenced variables --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -30,7 +30,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 d8253c7c02..cfa600c3c5 100644 --- a/ext/standard/tests/array/array_values_variation7.phpt +++ b/ext/standard/tests/array/array_values_variation7.phpt @@ -3,7 +3,7 @@ Test array_values() function : usage variations - Internal order check --FILE-- <?php /* Prototype : array array_values(array $input) - * Description: Return just the values from the input array + * Description: Return just the values from the input array * Source code: ext/standard/array.c */ @@ -26,7 +26,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_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt index 066d35da84..8b1e2c0b0e 100644 --- a/ext/standard/tests/array/array_values_variation_64bit.phpt +++ b/ext/standard/tests/array/array_values_variation_64bit.phpt @@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) ); echo "\n*** Testing array_values() with range checking ***\n"; $arr_range = array( - 2147483647, - 2147483648, + 2147483647, + 2147483648, -2147483647, -2147483648, -0, @@ -34,7 +34,7 @@ var_dump( array_values(array(1,2,3)) ); var_dump( array_values(array()) ); // null array ?> ---EXPECTF-- +--EXPECTF-- *** Testing array_values() with resource type *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt index 5808f4b948..d3ef3750b0 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -30,11 +30,11 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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_basic1.phpt b/ext/standard/tests/array/array_walk_basic1.phpt index bb106b1fba..e4bdf1b895 100644 --- a/ext/standard/tests/array/array_walk_basic1.phpt +++ b/ext/standard/tests/array/array_walk_basic1.phpt @@ -3,7 +3,7 @@ Test array_walk() function : basic functionality - regular array --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -13,7 +13,7 @@ echo "*** Testing array_walk() : basic functionality ***\n"; $fruits = array("lemon", "orange", "banana", "apple"); /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - item in key/item pair + * Parameters : item - item in key/item pair * key - key in key/item pair * Description : prints the array values with keys */ @@ -21,16 +21,16 @@ function test_print($item, $key) { // dump the arguments to check that they are passed // with proper type - var_dump($item); // value - var_dump($key); // key + var_dump($item); // value + var_dump($key); // key echo "\n"; // new line to separate the output between each element } function with_userdata($item, $key, $user_data) { // dump the arguments to check that they are passed // with proper type - var_dump($item); // value - var_dump($key); // key + var_dump($item); // value + var_dump($key); // key var_dump($user_data); // user supplied data echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt index ee5b4e9925..3ef15605e7 100644 --- a/ext/standard/tests/array/array_walk_basic2.phpt +++ b/ext/standard/tests/array/array_walk_basic2.phpt @@ -3,7 +3,7 @@ Test array_walk() function : basic functionality - associative array --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -14,11 +14,11 @@ $fruits = array("d" => "lemon", "a" => "orange", "b" => "banana", "c" => "apple" // User defined callback functions /* Prototype : test_alter(mixed $item, mixed $key, string $prefix) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair - * prefix - string to be added + * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix) } /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair * Description : prints the array values with keys */ diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt index 3799fde1cc..846e8a01af 100644 --- a/ext/standard/tests/array/array_walk_closure.phpt +++ b/ext/standard/tests/array/array_walk_closure.phpt @@ -93,11 +93,11 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt index fb77e92e8a..334dfe4ef7 100644 --- a/ext/standard/tests/array/array_walk_error1.phpt +++ b/ext/standard/tests/array/array_walk_error1.phpt @@ -3,7 +3,7 @@ Test array_walk() function : error conditions --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt index a4026180fb..fd3cbf5037 100644 --- a/ext/standard/tests/array/array_walk_error2.phpt +++ b/ext/standard/tests/array/array_walk_error2.phpt @@ -3,7 +3,7 @@ Test array_walk() function : error conditions - callback parameters --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -35,12 +35,12 @@ try { // expected: Warning is suppressed try { - var_dump( @array_walk($input, "callback1") ); + var_dump( @array_walk($input, "callback1") ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { - var_dump( @array_walk($input, "callback2", 4) ); + var_dump( @array_walk($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt index cd06ea3096..3bd83fdab2 100644 --- a/ext/standard/tests/array/array_walk_object1.phpt +++ b/ext/standard/tests/array/array_walk_object1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk() function : object functionality +Test array_walk() function : object functionality --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -40,10 +40,10 @@ class MyClass $this->pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 89442078b1..97606a6592 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -3,7 +3,7 @@ Test array_walk() function : object functionality - array of objects --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ echo "*** Testing array_walk() : array of objects ***\n"; * Description : Function adds the addvalue to each element of an array */ function callback_private($value, $key, $addValue) -{ +{ echo "value : "; var_dump($value->getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -73,11 +73,11 @@ var_dump( array_walk($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk($input, "callback_protected")); +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_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index fc04304fc5..f9214d25a5 100644 --- a/ext/standard/tests/array/array_walk_objects.phpt +++ b/ext/standard/tests/array/array_walk_objects.phpt @@ -3,8 +3,8 @@ array_walk() and objects --FILE-- <?php -function walk($key, $value) { - var_dump($value, $key); +function walk($key, $value) { + var_dump($value, $key); } class test { @@ -28,7 +28,7 @@ array_walk($var, "walk"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt index a83c227a3b..d2fa9b86eb 100644 --- a/ext/standard/tests/array/array_walk_rec_objects.phpt +++ b/ext/standard/tests/array/array_walk_rec_objects.phpt @@ -3,8 +3,8 @@ array_walk_recursive() and objects --FILE-- <?php -function walk($key, $value) { - var_dump($value, $key); +function walk($key, $value) { + var_dump($value, $key); } class test { @@ -28,7 +28,7 @@ array_walk_recursive($var, "walk"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(3) "foo" string(3) "foo" string(3) "bar" 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..07f09c5263 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -30,11 +30,11 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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_basic1.phpt b/ext/standard/tests/array/array_walk_recursive_basic1.phpt index 606861565c..df192b6a79 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic1.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : basic functionality - regular array --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -13,7 +13,7 @@ echo "*** Testing array_walk_recursive() : basic functionality ***\n"; $fruits = array("lemon", array("orange", "banana"), array("apple")); /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - item in key/item pair + * Parameters : item - item in key/item pair * key - key in key/item pair * Description : prints the array values with keys */ @@ -21,16 +21,16 @@ function test_print($item, $key) { // dump the arguments to check that they are passed // with proper type - var_dump($item); // value - var_dump($key); // key + var_dump($item); // value + var_dump($key); // key echo "\n"; // new line to separate the output between each element } function with_userdata($item, $key, $user_data) { // dump the arguments to check that they are passed // with proper type - var_dump($item); // value - var_dump($key); // key + var_dump($item); // value + var_dump($key); // key var_dump($user_data); // user supplied data echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt index ac5c35440f..a049c0b812 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : basic functionality - associative array --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -14,11 +14,11 @@ $fruits = array("a" => "lemon", "b" => array( "c" => "orange", "d" => "banana"), // User defined callback functions /* Prototype : test_alter(mixed $item, mixed $key, string $prefix) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair - * prefix - string to be added + * prefix - string to be added * Description : alters the array values by appending prefix string - */ + */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix) } /* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair + * Parameters : item - value in key/value pair * key - key in key/value pair * Description : prints the array values with keys */ diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt index b149eecbfd..75966e8833 100644 --- a/ext/standard/tests/array/array_walk_recursive_error1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : error conditions --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt index b162a1c9dc..5a077c6886 100644 --- a/ext/standard/tests/array/array_walk_recursive_error2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : error conditions - callback parameters --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -35,12 +35,12 @@ try { // expected: Warning is suppressed try { - var_dump( @array_walk_recursive($input, "callback1") ); + var_dump( @array_walk_recursive($input, "callback1") ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } try { - var_dump( @array_walk_recursive($input, "callback2", 4) ); + var_dump( @array_walk_recursive($input, "callback2", 4) ); } catch (Throwable $e) { echo "Exception: " . $e->getMessage() . "\n"; } diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt index 0bfbeee067..5c01c55817 100644 --- a/ext/standard/tests/array/array_walk_recursive_object1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object1.phpt @@ -3,11 +3,11 @@ Test array_walk_recursive() function : object functionality --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ -/* Passing object in place of an 'input' argument to test object functionality +/* Passing object in place of an 'input' argument to test object functionality */ echo "*** Testing array_walk_recursive() : object functionality ***\n"; @@ -38,10 +38,10 @@ class MyClass $this->pub_value = $setVal; $this->pro_value = $setVal; } -}; +}; // object for 'input' argument -$input = new MyClass(10); +$input = new MyClass(10); var_dump( array_walk_recursive($input, "callback", 1)); diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index 89e8feb71c..87d8e49d95 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : object functionality - array of objects --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ echo "*** Testing array_walk_recursive() : array of objects ***\n"; * Description : Function adds the addvalue to each element of an array */ function callback_private($value, $key, $addValue) -{ +{ echo "value : "; var_dump($value->getValue()); echo "key : "; @@ -58,7 +58,7 @@ class MyClass { return $this->pro_value; } -}; +}; // array containing objects of MyClass $input = array ( @@ -75,11 +75,11 @@ var_dump( array_walk_recursive($input, "callback_private", 1)); echo "-- For public member --\n"; var_dump( array_walk_recursive($input, "callback_public")); echo "-- For protected member --\n"; -var_dump( array_walk_recursive($input, "callback_protected")); +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..5b8c0b1d1d 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument +Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -65,7 +65,7 @@ $input_values = array( // empty data /* 16*/ "", - '', + '', // string data /* 18*/ "string", @@ -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_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt index 5c8c56dcc2..bef44b59ad 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - unexpected values in p --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 2a056acb26..96c93d6f35 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - 'input' array with dif --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -29,11 +29,11 @@ echo "*** Testing array_walk_recursive() : 'input' array with different values** // different arrays as input $input_values = array( - + // integer values /*1*/ array(array(1, 0, -10), array(023, -041), array(0x5A, 0X1F, -0x6E)), - - // float value + + // float value array(array(3.4, 0.8, -2.9), array(6.25e2, 8.20E-3)), // string values @@ -58,10 +58,10 @@ $input_values = array( for($count = 0; $count < count($input_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; var_dump( array_walk_recursive($input_values[$count], "print_value", $count+1)); -} +} 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..a7cf93bd9a 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt @@ -3,12 +3,12 @@ Test array_walk_recursive() function : usage variations - 'input' array with sub --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ /* - * Testing array_walk_recursive() with an array having subarrays as elements + * Testing array_walk_recursive() with an array having subarrays as elements */ echo "*** Testing array_walk_recursive() : array with subarray ***\n"; @@ -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..4db5989582 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - 'input' argument conta --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -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..fdda065904 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt @@ -3,12 +3,12 @@ Test array_walk_recursive() function : usage variations - 'input' argument as di --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ /* - * Passing 'input' argument as an associative array + * Passing 'input' argument as an associative array * with Numeric & string keys */ @@ -16,14 +16,14 @@ echo "*** Testing array_walk_recursive() : 'input' as an associative array ***\n // callback functions /* Prototype : for_numeric( int $value, int $key, int $user_data) - * Parameters : $value - value from key/value pair of the array + * Parameters : $value - value from key/value pair of the array * $key - key from key/value pair of the array * $user_data - data to be added to 'value' * Description : Function adds values with keys & user_data */ function for_numeric($value, $key, $user_data) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -38,7 +38,7 @@ function for_numeric($value, $key, $user_data) */ function for_string($value, $key) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -52,7 +52,7 @@ function for_string($value, $key) */ function for_mixed($value, $key) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -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_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt index 06dc1aaa09..bc0d205900 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - anonymous callback fun --FILE-- <?php /* Prototype : proto bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n"; var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10)); echo "-- Anonymous function with one more argument --\n"; -var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); +var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); echo "-- Anonymous function with null argument --\n"; var_dump( array_walk_recursive( $input, function() { echo "1\n"; })); diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt index 2db8067fe0..671fcdb375 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - buit-in function as ca --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt index 73619ada19..780d779a7e 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt @@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - different callback fun --FILE-- <?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -46,11 +46,11 @@ function callback_no_parameter() var_dump( array_walk_recursive($input, 'callback_no_parameter')); echo "-- passing one more parameter to function with two parameters --\n"; -var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); +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..4121f1a5a1 100644 --- a/ext/standard/tests/array/array_walk_variation1.phpt +++ b/ext/standard/tests/array/array_walk_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test array_walk() function : usage variations - unexpected values for 'input' argument +Test array_walk() function : usage variations - unexpected values for 'input' argument --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -65,7 +65,7 @@ $input_values = array( // empty data /* 16*/ "", - '', + '', // string data /* 18*/ "string", @@ -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_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt index 1780f66bae..5cfee36cb4 100644 --- a/ext/standard/tests/array/array_walk_variation2.phpt +++ b/ext/standard/tests/array/array_walk_variation2.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - unexpected values in place of 'f --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 5f33bc1f15..964853705c 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - 'input' array with different val --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -29,11 +29,11 @@ echo "*** Testing array_walk() : 'input' array with different values***\n"; // different arrays as input $input_values = array( - + // integer values /*1*/ array(1, 0, -10, 023, -041, 0x5A, 0X1F, -0x6E), - - // float value + + // float value array(3.4, 0.8, -2.9, 6.25e2, 8.20E-3), // string values @@ -58,10 +58,10 @@ $input_values = array( for($count = 0; $count < count($input_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; var_dump( array_walk($input_values[$count], "print_value", $count+1)); -} +} 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..c495f2acfc 100644 --- a/ext/standard/tests/array/array_walk_variation4.phpt +++ b/ext/standard/tests/array/array_walk_variation4.phpt @@ -3,12 +3,12 @@ Test array_walk() function : usage variations - 'input' array with subarray --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ /* - * Testing array_walk() with an array having subarrays as elements + * Testing array_walk() with an array having subarrays as elements */ echo "*** Testing array_walk() : array with subarray ***\n"; @@ -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..c80cfba44f 100644 --- a/ext/standard/tests/array/array_walk_variation5.phpt +++ b/ext/standard/tests/array/array_walk_variation5.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - 'input' argument containing refe --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -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..5392618c17 100644 --- a/ext/standard/tests/array/array_walk_variation6.phpt +++ b/ext/standard/tests/array/array_walk_variation6.phpt @@ -3,12 +3,12 @@ Test array_walk() function : usage variations - 'input' argument as diff. associ --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ /* - * Passing 'input' argument as an associative array + * Passing 'input' argument as an associative array * with Numeric & string keys */ @@ -16,14 +16,14 @@ echo "*** Testing array_walk() : 'input' as an associative array ***\n"; // callback functions /* Prototype : for_numeric( int $value, int $key, int $user_data) - * Parameters : $value - value from key/value pair of the array + * Parameters : $value - value from key/value pair of the array * $key - key from key/value pair of the array * $user_data - data to be added to 'value' * Description : Function adds values with keys & user_data */ function for_numeric($value, $key, $user_data) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -38,7 +38,7 @@ function for_numeric($value, $key, $user_data) */ function for_string($value, $key) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -52,7 +52,7 @@ function for_string($value, $key) */ function for_mixed($value, $key) { - // dump the input values to see if they are + // dump the input values to see if they are // passed with correct type var_dump($key); var_dump($value); @@ -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_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt index 671ad44309..692f276628 100644 --- a/ext/standard/tests/array/array_walk_variation7.phpt +++ b/ext/standard/tests/array/array_walk_variation7.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - anonymous callback function --FILE-- <?php /* Prototype : proto bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n"; var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10)); echo "-- Anonymous function with one more argument --\n"; -var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); +var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); echo "-- Anonymous function with null argument --\n"; var_dump( array_walk( $input, function() { echo "1\n"; })); diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt index 829baf1add..56a60e6b0f 100644 --- a/ext/standard/tests/array/array_walk_variation8.phpt +++ b/ext/standard/tests/array/array_walk_variation8.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - buit-in function as callback --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt index 65ef50cc8e..3af6316c12 100644 --- a/ext/standard/tests/array/array_walk_variation9.phpt +++ b/ext/standard/tests/array/array_walk_variation9.phpt @@ -3,7 +3,7 @@ Test array_walk() function : usage variations - different callback functions --FILE-- <?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) - * Description: Apply a user function to every member of an array + * Description: Apply a user function to every member of an array * Source code: ext/standard/array.c */ @@ -46,11 +46,11 @@ function callback_no_parameter() var_dump( array_walk($input, 'callback_no_parameter')); echo "-- passing one more parameter to function with two parameters --\n"; -var_dump( array_walk($input, 'callback_two_parameter', 10)); +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 87c5138835..598fe6aab3 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test arsort() function : basic functionality +Test arsort() function : basic functionality --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) * Description: Sort an array and maintain index association - Elements will be arranged from highest to lowest when this function has completed. + Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ /* - * Testing arsort() by providing integer/string arrays to check the basic functionality + * Testing arsort() by providing integer/string arrays to check the basic functionality * with following flag values. * flag value as default * SORT_REGULAR - compare items normally @@ -19,13 +19,13 @@ Test arsort() function : basic functionality echo "*** Testing arsort() : basic functionality ***\n"; -// an array containing unsorted string values with indices +// an array containing unsorted string values with indices $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 ); echo "\n-- Testing arsort() by supplying string array, 'flag' value is default --\n"; @@ -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_error.phpt b/ext/standard/tests/array/arsort_error.phpt index 5a24815697..676d8265ed 100644 --- a/ext/standard/tests/array/arsort_error.phpt +++ b/ext/standard/tests/array/arsort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test arsort() function : error conditions +Test arsort() function : error conditions --FILE-- <?php /* Prototype : bool arsort(array &array_arg [, int sort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ /* -* Testing arsort() function with all possible error conditions +* Testing arsort() function with all possible error conditions */ echo "*** Testing arsort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt index 75cee2de5b..f73696392e 100644 --- a/ext/standard/tests/array/arsort_object1.phpt +++ b/ext/standard/tests/array/arsort_object1.phpt @@ -1,15 +1,15 @@ --TEST-- -Test arsort() function : object functionality - sort objects +Test arsort() function : object functionality - sort objects --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ /* - * testing arsort() by providing integer/string object arrays with following flag values + * testing arsort() by providing integer/string object arrays with following flag values * 1. Defualt flag value * 2. SORT_REGULAR - compare items normally */ @@ -44,14 +44,14 @@ class for_string_arsort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_arsort(11), 2 => new for_integer_asort(66), 3 => new for_integer_arsort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_arsort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_arsort("w"), "d" => new for_string_asort("py"), "e" => new for_string_arsort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index 338c852446..f5ed333623 100644 --- a/ext/standard/tests/array/arsort_object2.phpt +++ b/ext/standard/tests/array/arsort_object2.phpt @@ -1,15 +1,15 @@ --TEST-- -Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars +Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ /* - * testing arsort() by providing integer/string object arrays with following flag values + * testing arsort() by providing integer/string object arrays with following flag values * 1. Defualt flag value 2. SORT_REGULAR - compare items normally */ @@ -21,7 +21,7 @@ class for_integer_arsort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_arsort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_arsort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_arsort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_arsort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_arsort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_arsort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index 7deb964b9d..c32e377295 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -4,7 +4,7 @@ Test arsort() function : usage variations - unexpected values for 'array_arg' ar <?php /* Prototype : bool arsort(array &array_arg [, int sort_flags]) * Description: Sort an array and maintain index association - Elements will be arranged from highest to lowest when this function has completed. + Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -76,7 +76,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of arsort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { @@ -99,55 +99,55 @@ 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php on line %d bool(false) -- Iteration 5 -- @@ -242,55 +242,55 @@ Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variat 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php 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 %sarsort_variation1.php on line %d bool(false) -- Iteration 16 -- diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index bd249531e7..0520e455c6 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort octal values +Test arsort() function : usage variations - sort octal values --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -18,8 +18,8 @@ Test arsort() function : usage variations - sort octal values echo "*** Testing arsort() : usage variations ***\n"; // an array contains unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); @@ -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..b669cf078f 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..b716b65793 100644 --- a/ext/standard/tests/array/arsort_variation2.phpt +++ b/ext/standard/tests/array/arsort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( arsort($temp_array, $value) ); + var_dump( arsort($temp_array, $value) ); var_dump($temp_array); $counter++; } @@ -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 %sarsort_variation2.php 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 %sarsort_variation2.php 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 %sarsort_variation2.php 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 %sarsort_variation2.php 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 %sarsort_variation2.php on line %d bool(false) array(3) { [1]=> @@ -271,7 +271,7 @@ array(3) { } -- Iteration 18 -- -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 %sarsort_variation2.php on line %d bool(false) array(3) { [1]=> @@ -283,7 +283,7 @@ array(3) { } -- Iteration 19 -- -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 %sarsort_variation2.php on line %d bool(false) array(3) { [1]=> @@ -295,7 +295,7 @@ array(3) { } -- 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 %sarsort_variation2.php on line %d bool(false) array(3) { [1]=> diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index 9f8d47f47c..765efe874d 100644 --- a/ext/standard/tests/array/arsort_variation3.phpt +++ b/ext/standard/tests/array/arsort_variation3.phpt @@ -3,7 +3,7 @@ Test arsort() function : usage variations - sort integer/float values --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association + * Description: Sort an array and maintain index association Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -27,7 +27,7 @@ $various_arrays = array( // mixed value array array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing arsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(arsort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(arsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index 2d72a6d776..b52d3a16a2 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort reference variables +Test arsort() function : usage variations - sort reference variables --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ $value1 = 100; $value2 = 33; $value3 = 555; -// an array containing integer references +// an array containing integer references $unsorted_numerics = array( 1 => &$value1 , 2 => &$value2, 3 => &$value3); echo "\n-- Testing arsort() by supplying reference variable array, 'flag' value is defualt --\n"; @@ -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..b7adf76eab 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association + * Description: Sort an array and maintain index association Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -23,14 +23,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { echo "*** Testing arsort() : usage variations ***\n"; $various_arrays = array ( - // group of escape sequences - array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + // group of escape sequences + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + // array contains combination of capital/small letters + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) @@ -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 32e732dd4a..ff85223ef4 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort hexadecimal values +Test arsort() function : usage variations - sort hexadecimal values --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ Test arsort() function : usage variations - sort hexadecimal values echo "*** Testing arsort() : usage variations ***\n"; -// an array contains unsorted hexadecimal values +// an array contains unsorted hexadecimal values // There are multiple keys which are duplicate and the later should be picked $unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa @@ -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..d65f11ce98 100644 --- a/ext/standard/tests/array/arsort_variation7.phpt +++ b/ext/standard/tests/array/arsort_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort bool values +Test arsort() function : usage variations - sort bool values --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: This function arsorts an array. + * Description: This function arsorts an array. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -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 87593d5437..d190408d54 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR +Test arsort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -29,7 +29,7 @@ $various_arrays = array ( "array[2]" => array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ), // array contains sub arrays - "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), + "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() ) ); @@ -39,8 +39,8 @@ echo "\n-- Testing arsort() by supplying various arrays containing sub arrays -- // loop through to test arsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing arsort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; @@ -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..61c532e4d8 100644 --- a/ext/standard/tests/array/arsort_variation9.phpt +++ b/ext/standard/tests/array/arsort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR +Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool arsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from highest to lowest when this function has completed. * Source code: ext/standard/array.c */ @@ -30,8 +30,8 @@ $various_arrays = array ( $count = 1; echo "\n-- Testing arsort() by supplying various arrays with key values --\n"; -// loop through to test arsort() with different arrays, -// to test the new keys for the elements in the sorted array +// loop through to test arsort() with different arrays, +// to test the new keys for the elements in the sorted array foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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 4bc5ce0235..03c696499b 100644 --- a/ext/standard/tests/array/asort_basic.phpt +++ b/ext/standard/tests/array/asort_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test asort() function : basic functionality +Test asort() function : basic functionality --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) * Description: Sort an array and maintain index association - Elements will be arranged from lowest to highest when this function has completed. + Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ /* - * Testing asort() by providing integer/string arrays to check the basic functionality + * Testing asort() by providing integer/string arrays to check the basic functionality * with following flag values. * flag value as default * SORT_REGULAR - compare items normally @@ -19,13 +19,13 @@ Test asort() function : basic functionality echo "*** Testing asort() : basic functionality ***\n"; -// an array containing unsorted string values with indices +// an array containing unsorted string values with indices $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 ); echo "\n-- Testing asort() by supplying string array, 'flag' value is default --\n"; @@ -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_error.phpt b/ext/standard/tests/array/asort_error.phpt index 821663fa64..ef2329585b 100644 --- a/ext/standard/tests/array/asort_error.phpt +++ b/ext/standard/tests/array/asort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test asort() function : error conditions +Test asort() function : error conditions --FILE-- <?php /* Prototype : bool asort(array &array_arg [, int sort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ /* -* Testing asort() function with all possible error conditions +* Testing asort() function with all possible error conditions */ echo "*** Testing asort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/asort_object1.phpt index 21984de67e..ad54675d64 100644 --- a/ext/standard/tests/array/asort_object1.phpt +++ b/ext/standard/tests/array/asort_object1.phpt @@ -1,15 +1,15 @@ --TEST-- -Test asort() function : object functionality - sort objects +Test asort() function : object functionality - sort objects --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ /* - * testing asort() by providing integer/string object arrays with following flag values + * testing asort() by providing integer/string object arrays with following flag values * 1. Defualt flag value * 2. SORT_REGULAR - compare items normally */ @@ -44,14 +44,14 @@ class for_string_asort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_asort(11), 2 => new for_integer_asort(66), 3 => new for_integer_asort(23), 4 => new for_integer_asort(-5), 5 => new for_integer_asort(0.001), 6 => new for_integer_asort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx"), "b" => new for_string_asort("t"), "c" => new for_string_asort("w"), "d" => new for_string_asort("py"), "e" => new for_string_asort("apple"), "f" => new for_string_asort("Orange"), diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt index 8f2a666146..be761205b2 100644 --- a/ext/standard/tests/array/asort_object2.phpt +++ b/ext/standard/tests/array/asort_object2.phpt @@ -1,15 +1,15 @@ --TEST-- -Test asort() function : object functionality - sorting objects with diff. accessibility of member vars +Test asort() function : object functionality - sorting objects with diff. accessibility of member vars --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ /* - * testing asort() by providing integer/string object arrays with following flag values + * testing asort() by providing integer/string object arrays with following flag values * 1. Defualt flag value 2. SORT_REGULAR - compare items normally */ @@ -21,7 +21,7 @@ class for_integer_asort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -36,7 +36,7 @@ class for_string_asort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; @@ -51,13 +51,13 @@ class for_string_asort } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 1 => new for_integer_asort(11, 33,2), 2 => new for_integer_asort(44, 66,3), 3 => new for_integer_asort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4), ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "a" => new for_string_asort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"), "c" => new for_string_asort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"), ); diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 15c4faa67a..07fc53787b 100644 --- a/ext/standard/tests/array/asort_variation1.phpt +++ b/ext/standard/tests/array/asort_variation1.phpt @@ -4,7 +4,7 @@ Test asort() function : usage variations - unexpected values for 'array_arg' arg <?php /* Prototype : bool asort(array &array_arg [, int sort_flags]) * Description: Sort an array and maintain index association - Elements will be arranged from lowest to highest when this function has completed. + Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -76,7 +76,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of asort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { @@ -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 -- diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index 39b05c1700..793315e999 100644 --- a/ext/standard/tests/array/asort_variation10.phpt +++ b/ext/standard/tests/array/asort_variation10.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort octal values +Test asort() function : usage variations - sort octal values --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -18,8 +18,8 @@ Test asort() function : usage variations - sort octal values echo "*** Testing asort() : usage variations ***\n"; // an array contains unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, +$unsorted_oct_array = array ( + 01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 077 => 077, -066 => -066, -0345 => -0345, 0 => 0 ); @@ -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..a1db5cbdf7 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..f58663cdaa 100644 --- a/ext/standard/tests/array/asort_variation2.phpt +++ b/ext/standard/tests/array/asort_variation2.phpt @@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( asort($temp_array, $value) ); + var_dump( asort($temp_array, $value) ); var_dump($temp_array); $counter++; } @@ -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]=> @@ -271,7 +271,7 @@ array(3) { } -- Iteration 18 -- -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]=> @@ -283,7 +283,7 @@ array(3) { } -- Iteration 19 -- -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]=> @@ -295,7 +295,7 @@ array(3) { } -- 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_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index 4ad106b658..a9d3f6afa3 100644 --- a/ext/standard/tests/array/asort_variation3.phpt +++ b/ext/standard/tests/array/asort_variation3.phpt @@ -3,7 +3,7 @@ Test asort() function : usage variations - sort integer/float values --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association + * Description: Sort an array and maintain index association Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -27,7 +27,7 @@ $various_arrays = array( // mixed value array array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33), - + // array values contains minimum and maximum ranges array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649) ); @@ -42,20 +42,20 @@ echo "\n-- Testing asort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With default sort_flag -\n"; - $temp_array = $array; + echo "- With default sort_flag -\n"; + $temp_array = $array; var_dump(asort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort_flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(asort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt index 222ed2d1d0..088e58a3da 100644 --- a/ext/standard/tests/array/asort_variation4.phpt +++ b/ext/standard/tests/array/asort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort reference variables +Test asort() function : usage variations - sort reference variables --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ $value1 = 100; $value2 = 33; $value3 = 555; -// an array containing integer references +// an array containing integer references $unsorted_numerics = array( 1 => &$value1 , 2 => &$value2, 3 => &$value3); echo "\n-- Testing asort() by supplying reference variable array, 'flag' value is defualt --\n"; @@ -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..e416a59ca6 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association + * Description: Sort an array and maintain index association Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -23,14 +23,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { echo "*** Testing asort() : usage variations ***\n"; $various_arrays = array ( - // group of escape sequences - array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + // group of escape sequences + array ("null"=> null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), - // array contains combination of capital/small letters - array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", + // array contains combination of capital/small letters + array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe", 'B' => "BANANA" ) @@ -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..a25e96fd64 100644 --- a/ext/standard/tests/array/asort_variation6.phpt +++ b/ext/standard/tests/array/asort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort hexadecimal values +Test asort() function : usage variations - sort hexadecimal values --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $asort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ Test asort() function : usage variations - sort hexadecimal values echo "*** Testing asort() : usage variations ***\n"; -// an array contains unsorted hexadecimal values +// an array contains unsorted hexadecimal values // There are multiple keys which are duplicate and the later should be picked $unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa @@ -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..a32c0de859 100644 --- a/ext/standard/tests/array/asort_variation7.phpt +++ b/ext/standard/tests/array/asort_variation7.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort bool values +Test asort() function : usage variations - sort bool values --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: This function asorts an array. + * Description: This function asorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -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..b097346dff 100644 --- a/ext/standard/tests/array/asort_variation8.phpt +++ b/ext/standard/tests/array/asort_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR +Test asort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -29,7 +29,7 @@ $various_arrays = array ( "array[2]" => array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ), // array contains sub arrays - "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), + "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() ) ); @@ -39,8 +39,8 @@ echo "\n-- Testing asort() by supplying various arrays containing sub arrays --\ // loop through to test asort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing asort() function by supplying different arrays, flag value is default echo "- With default sort_flag -\n"; $temp_array = $array; @@ -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..f3c27ef94a 100644 --- a/ext/standard/tests/array/asort_variation9.phpt +++ b/ext/standard/tests/array/asort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR +Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR --FILE-- <?php /* Prototype : bool asort ( array &$array [, int $sort_flags] ) - * Description: Sort an array and maintain index association. + * Description: Sort an array and maintain index association. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -30,8 +30,8 @@ $various_arrays = array ( $count = 1; echo "\n-- Testing asort() by supplying various arrays with key values --\n"; -// loop through to test asort() with different arrays, -// to test the new keys for the elements in the sorted array +// loop through to test asort() with different arrays, +// to test the new keys for the elements in the sorted array foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt index e1bb0033ea..aa52dc590a 100644 --- a/ext/standard/tests/array/bug21998.phpt +++ b/ext/standard/tests/array/bug21998.phpt @@ -7,11 +7,11 @@ $a = array("a", "b", "c"); var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); var_dump(array_pop($a)); -var_dump(key($a)); +var_dump(key($a)); ?> --EXPECT-- diff --git a/ext/standard/tests/array/bug22463.phpt b/ext/standard/tests/array/bug22463.phpt index 7993ac2576..dcede511bb 100644 --- a/ext/standard/tests/array/bug22463.phpt +++ b/ext/standard/tests/array/bug22463.phpt @@ -8,7 +8,7 @@ function a($ary) { } function cb($v, $elem) { - return $v + a($elem); + return $v + a($elem); } $ary = array( diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt index a1a30afb6d..b1cd523026 100644 --- a/ext/standard/tests/array/bug24198.phpt +++ b/ext/standard/tests/array/bug24198.phpt @@ -2,9 +2,9 @@ Bug #24198 (array_merge_recursive() invalid recursion detection) --FILE-- <?php -$c = array('a' => 'aa','b' => 'bb'); +$c = array('a' => 'aa','b' => 'bb'); -var_dump(array_merge_recursive($c, $c)); +var_dump(array_merge_recursive($c, $c)); ?> --EXPECT-- array(2) { diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt index 6c97562f6c..b9e04fd67f 100644 --- a/ext/standard/tests/array/bug24980.phpt +++ b/ext/standard/tests/array/bug24980.phpt @@ -9,7 +9,7 @@ function add_up($running_total, $current_value) $running_total += $current_value * $current_value; return $running_total; } - + $numbers = array (2,3,5,7); $total = array_reduce($numbers, 'add_up'); print "Total is $total\n"; @@ -21,7 +21,7 @@ function foo ($a, $b) return $a . $b; } var_dump(array_reduce($a, "foo")); - + /* test #3: basic test (used to leak memory) */ function rsum($v, $w) { 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/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 289e802c00..7720fe0006 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -3,7 +3,7 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, af --FILE-- <?php error_reporting(E_ALL & ~E_NOTICE); // We don't want the notice for $undefined -$result = extract(array('a'=>$undefined), EXTR_REFS); +$result = extract(array('a'=>$undefined), EXTR_REFS); var_dump(array($a)); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt index c79c33fa74..728a659d8f 100644 --- a/ext/standard/tests/array/bug30833.phpt +++ b/ext/standard/tests/array/bug30833.phpt @@ -13,7 +13,7 @@ var_dump($foo); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> string(3) "abc" diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/bug33382.phpt index 0153da90bd..e54b984fd0 100644 --- a/ext/standard/tests/array/bug33382.phpt +++ b/ext/standard/tests/array/bug33382.phpt @@ -11,7 +11,7 @@ var_dump(array_reverse($array)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index 9110379d9d..eb5b85e700 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..12aa35c347 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/bug35014.phpt b/ext/standard/tests/array/bug35014.phpt index f858bf107b..9250c03e10 100644 --- a/ext/standard/tests/array/bug35014.phpt +++ b/ext/standard/tests/array/bug35014.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt index 5caf48c6ee..efd791ac99 100644 --- a/ext/standard/tests/array/bug35014_64bit.phpt +++ b/ext/standard/tests/array/bug35014_64bit.phpt @@ -22,7 +22,7 @@ foreach ($tests as $v) { var_dump(array_product($v)); } ?> ---EXPECTF-- +--EXPECTF-- Warning: array_product() expects parameter 1 to be array, string given in %s on line %d NULL int(1) diff --git a/ext/standard/tests/array/bug35022.phpt b/ext/standard/tests/array/bug35022.phpt index 07138f138d..e3f5386482 100644 --- a/ext/standard/tests/array/bug35022.phpt +++ b/ext/standard/tests/array/bug35022.phpt @@ -13,7 +13,7 @@ foo($state); reset($state); var_dump( key($state), current($state) ); ?> ---EXPECT-- +--EXPECT-- three => 3 two => 2 one => 1 diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt index be48ca8570..d7abc7773b 100644 --- a/ext/standard/tests/array/bug35821.phpt +++ b/ext/standard/tests/array/bug35821.phpt @@ -21,7 +21,7 @@ array_map(array('Element', 'CallBack'), $arr); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught Exception in %s:%d Stack trace: diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/bug36975.phpt index 67a34325d0..7912fffca4 100644 --- a/ext/standard/tests/array/bug36975.phpt +++ b/ext/standard/tests/array/bug36975.phpt @@ -2,13 +2,13 @@ Bug #36975 (natcasesort() causes array_pop() to misbehave) --FILE-- <?php -$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc'); +$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc'); $test = natcasesort($a); -if ($test) { - echo "natcasesort success!\n"; -} -$val = array_pop($a); -$a[] = $val; +if ($test) { + echo "natcasesort success!\n"; +} +$val = array_pop($a); +$a[] = $val; var_dump($a); $b = array(1 => 'foo', 0 => 'baz'); diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt index 5480109ba2..42f7a6ab54 100644 --- a/ext/standard/tests/array/bug38464.phpt +++ b/ext/standard/tests/array/bug38464.phpt @@ -5,7 +5,7 @@ Bug #38464 (array_count_values() mishandles numeric strings) $array = array('-000', ' 001', 1, ' 123', '+123'); var_dump(array_count_values($array)); ?> ---EXPECT-- +--EXPECT-- array(5) { ["-000"]=> int(1) diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt index bb58e79183..f94aa3a2be 100644 --- a/ext/standard/tests/array/bug39576.phpt +++ b/ext/standard/tests/array/bug39576.phpt @@ -32,7 +32,7 @@ array_intersect_key ( echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Notice: Only variables should be passed by reference in %s on line %d object(Test)#%d (4) { ["_table"]=> 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/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt index 93836d0398..7e132ba3d4 100644 --- a/ext/standard/tests/array/bug40709.phpt +++ b/ext/standard/tests/array/bug40709.phpt @@ -19,7 +19,7 @@ echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n"; echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- result for arr1: 1,2,3 result for arr2: 1 result for arr1: 1,2,3 diff --git a/ext/standard/tests/array/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt index b2d133ef13..a03bdaf4ce 100644 --- a/ext/standard/tests/array/bug41121.phpt +++ b/ext/standard/tests/array/bug41121.phpt @@ -12,8 +12,8 @@ var_dump(range(2147483400, 2147483600, 100)); var_dump( range(2147483646, 2147483648, 1 ) ); var_dump( range(2147483646, 2147483657, 1 ) ); var_dump( range(2147483630, 2147483646, 5 ) ); - -// negative steps + +// negative steps var_dump( range(-2147483645, -2147483648, 1 ) ); var_dump( range(-2147483645, -2147483649, 1 ) ); var_dump( range(-2147483630, -2147483646, 5 ) ); @@ -23,7 +23,7 @@ var_dump(range(2147483647, 2147483645, 1 )); var_dump(range(2147483648, 2147483645, 1 )); ?> ---EXPECT-- +--EXPECT-- array(3) { [0]=> int(2147483400) diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt index 4c41607d34..9f1384eddd 100644 --- a/ext/standard/tests/array/bug41686.phpt +++ b/ext/standard/tests/array/bug41686.phpt @@ -6,17 +6,17 @@ $a = array(1,2,3); $b = array('a'=>1,'b'=>1,'c'=>2); var_dump( - array_slice($a, 1), + array_slice($a, 1), array_slice($a, 1, 2, TRUE), - array_slice($a, 1, NULL, TRUE), - array_slice($b, 1), - array_slice($b, 1, 2, TRUE), + array_slice($a, 1, NULL, TRUE), + array_slice($b, 1), + array_slice($b, 1, 2, TRUE), array_slice($b, 1, NULL, TRUE) ); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(2) { [0]=> int(2) diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt index 16063bbdfc..3baec831bd 100644 --- a/ext/standard/tests/array/bug42850.phpt +++ b/ext/standard/tests/array/bug42850.phpt @@ -1,11 +1,11 @@ --TEST-- -Bug #42850 (array_walk_recursive() leaves references) +Bug #42850 (array_walk_recursive() leaves references) --FILE-- <?php // Bug #42850 $data = array ('key1' => 'val1', array('key2' => 'val2')); -function apply_dumb($item, $key) {}; +function apply_dumb($item, $key) {}; var_dump($data); array_walk_recursive($data, 'apply_dumb'); $data2 = $data; diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt index 522ff1903b..8b8f3a6edb 100644 --- a/ext/standard/tests/array/bug43495.phpt +++ b/ext/standard/tests/array/bug43495.phpt @@ -8,7 +8,7 @@ $a["key1"]["key2"]["key3"]=&$a; $b=array("key1"=>array("key2"=>array())); $b["key1"]["key2"]["key3"]=&$b; -array_merge_recursive($a,$b); +array_merge_recursive($a,$b); /* Break recursion */ $a["key1"]["key2"]["key3"] = null; diff --git a/ext/standard/tests/array/bug43505.phpt b/ext/standard/tests/array/bug43505.phpt index 219bbfe292..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 { @@ -33,4 +31,3 @@ array(1) { ["test"]=> &NULL } - diff --git a/ext/standard/tests/array/bug48484.phpt b/ext/standard/tests/array/bug48484.phpt index 5688c0cad8..0b4afe277a 100644 --- a/ext/standard/tests/array/bug48484.phpt +++ b/ext/standard/tests/array/bug48484.phpt @@ -4,5 +4,5 @@ Bug 48484 (array_product() always returns 0 for an empty array) <?php var_dump(array_product(array())); ?> ---EXPECT-- +--EXPECT-- int(1) 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..9db2c7796f 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - usort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); usort($data, 'magic_sort_cmp'); @@ -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..a501986981 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - uasort variant $data = array( 'bar-bazbazbaz.', - 'bar-bazbazbaz-', + 'bar-bazbazbaz-', 'foo' ); uasort($data, 'magic_sort_cmp'); @@ -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/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt index f5e06a4a02..1f0f6fe630 100644 --- a/ext/standard/tests/array/bug61058.phpt +++ b/ext/standard/tests/array/bug61058.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #61058 (array_fill leaks if start index is PHP_INT_MAX) --FILE-- -<?php +<?php array_fill(PHP_INT_MAX, 2, '*'); ?> --EXPECTF-- diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt index 8ed4c5081b..e5c9dfc5e6 100644 --- a/ext/standard/tests/array/bug65304.phpt +++ b/ext/standard/tests/array/bug65304.phpt @@ -5,6 +5,6 @@ Bug #65304 (Use of max int in array_sum) var_dump(array_sum(array(PHP_INT_MAX, 1))); var_dump(PHP_INT_MAX + 1); ?> ---EXPECTF-- +--EXPECTF-- float(%s) float(%s) diff --git a/ext/standard/tests/array/bug68553.phpt b/ext/standard/tests/array/bug68553.phpt index fbee975d17..91c5b080a9 100644 --- a/ext/standard/tests/array/bug68553.phpt +++ b/ext/standard/tests/array/bug68553.phpt @@ -8,7 +8,7 @@ while ($i--) { $fd = fopen(__FILE__, "r"); fclose($fd); } -$a = [ +$a = [ ['a' => 10], ['a' => 20], ['a' => true], 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/bug70713.phpt b/ext/standard/tests/array/bug70713.phpt index 7cd0a0f113..4e2792ab4b 100644 --- a/ext/standard/tests/array/bug70713.phpt +++ b/ext/standard/tests/array/bug70713.phpt @@ -8,12 +8,12 @@ class obj function __tostring() { global $arr; - + $arr = 1; for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } - + return 'hi'; } } diff --git a/ext/standard/tests/array/bug71220.phpt b/ext/standard/tests/array/bug71220.phpt index 49e5bb7719..28b5c08a8a 100644 --- a/ext/standard/tests/array/bug71220.phpt +++ b/ext/standard/tests/array/bug71220.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #71220 (Null pointer deref (segfault) in compact via ob_start) --FILE-- -<?php +<?php ob_start("compact"); ob_end_clean(); ?> 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/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 9f4021a409..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
\ No newline at end of file +Done diff --git a/ext/standard/tests/array/compact_error.phpt b/ext/standard/tests/array/compact_error.phpt index 9216ac9ba6..a7ef54597e 100644 --- a/ext/standard/tests/array/compact_error.phpt +++ b/ext/standard/tests/array/compact_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test compact() function : error conditions +Test compact() function : error conditions --FILE-- <?php /* Prototype : proto array compact(mixed var_names [, mixed ...]) - * Description: Creates a hash containing variables and their values + * Description: Creates a hash containing variables and their values * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ /* 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 79db8ab047..8ca5020d6d 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -25,16 +25,20 @@ 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" ["c"]=> string(3) "f.c" } -==Done==
\ No newline at end of file +==Done== diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 766592585a..010d6cdf3c 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test count() function : basic functionality +Test count() function : basic functionality --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/count_error.phpt index 32d15edc6f..76f7213645 100644 --- a/ext/standard/tests/array/count_error.phpt +++ b/ext/standard/tests/array/count_error.phpt @@ -3,7 +3,7 @@ Test count() function : error conditions - pass incorrect number of args --FILE-- <?php /* Prototype : int count(mixed var [, int mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt index 1e73bef27a..edec9fbe3f 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"); ?> +Test count() function --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_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt index 5152f65445..a58473c219 100644 --- a/ext/standard/tests/array/count_variation1.phpt +++ b/ext/standard/tests/array/count_variation1.phpt @@ -3,7 +3,7 @@ Test count() function : usage variations - Pass different data types as $var arg --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt index 67c8938eca..86a2b0108f 100644 --- a/ext/standard/tests/array/count_variation2.phpt +++ b/ext/standard/tests/array/count_variation2.phpt @@ -5,7 +5,7 @@ Test count() function : usage variations - Pass different data types as $mode ar --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), @@ -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..9c89bcd16b 100644 --- a/ext/standard/tests/array/count_variation3.phpt +++ b/ext/standard/tests/array/count_variation3.phpt @@ -3,7 +3,7 @@ Test count() function : usage variations - Infinitely recursive array --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) - * Description: Count the number of elements in a variable (usually an array) + * Description: Count the number of elements in a variable (usually an array) * Source code: ext/standard/array.c */ @@ -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..f2a6aad78e 100644 --- a/ext/standard/tests/array/current_basic.phpt +++ b/ext/standard/tests/array/current_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test current() function : basic functionality +Test current() function : basic functionality --FILE-- <?php /* Prototype : mixed current(array $array_arg) - * Description: Return the element currently pointed to by the internal array pointer + * Description: Return the element currently pointed to by the internal array pointer * Source code: ext/standard/array.c */ @@ -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..2cc78fc624 100644 --- a/ext/standard/tests/array/current_variation1.phpt +++ b/ext/standard/tests/array/current_variation1.phpt @@ -60,7 +60,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), @@ -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_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt index d839370962..49769cea3f 100644 --- a/ext/standard/tests/array/current_variation2.phpt +++ b/ext/standard/tests/array/current_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), 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..970c7d4045 --- /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/each.phpt b/ext/standard/tests/array/each.phpt Binary files differindex 74e571160e..f1b6f76ea6 100644 --- a/ext/standard/tests/array/each.phpt +++ b/ext/standard/tests/array/each.phpt diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt index cd38682dc7..b12b4c19f7 100644 --- a/ext/standard/tests/array/each_basic.phpt +++ b/ext/standard/tests/array/each_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test each() function : basic functionality +Test each() function : basic functionality --FILE-- <?php /* Prototype : array each(array $arr) - * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * Description: Return the currently pointed key..value pair in the passed array, + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ /* - * Test basic functionality of each() + * Test basic functionality of each() */ echo "*** Testing each() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt index 88055ce589..0806bee674 100644 --- a/ext/standard/tests/array/each_error.phpt +++ b/ext/standard/tests/array/each_error.phpt @@ -3,8 +3,8 @@ Test each() function : error conditions - pass incorrect number of args --FILE-- <?php /* Prototype : array each(array $arr) - * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * Description: Return the currently pointed key..value pair in the passed array, + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/array/each_variation1.phpt b/ext/standard/tests/array/each_variation1.phpt index a9e27cf3f9..becdfc4545 100644 --- a/ext/standard/tests/array/each_variation1.phpt +++ b/ext/standard/tests/array/each_variation1.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - Pass different data types as $arr arg <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt index e3dff968ff..73b1ba2746 100644 --- a/ext/standard/tests/array/each_variation2.phpt +++ b/ext/standard/tests/array/each_variation2.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - arrays of different data types <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt index 8a0773f0b5..375615643f 100644 --- a/ext/standard/tests/array/each_variation3.phpt +++ b/ext/standard/tests/array/each_variation3.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - keys of different data types <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ @@ -40,7 +40,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -49,8 +49,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -60,17 +60,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt index 7cddd3e5c3..14b5536135 100644 --- a/ext/standard/tests/array/each_variation4.phpt +++ b/ext/standard/tests/array/each_variation4.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - Referenced variables <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/array/each_variation5.phpt b/ext/standard/tests/array/each_variation5.phpt index b06e344eb8..b6c39538a3 100644 --- a/ext/standard/tests/array/each_variation5.phpt +++ b/ext/standard/tests/array/each_variation5.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - Multi-dimensional arrays <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/array/each_variation6.phpt b/ext/standard/tests/array/each_variation6.phpt index c36f9bb881..ba0f2657c8 100644 --- a/ext/standard/tests/array/each_variation6.phpt +++ b/ext/standard/tests/array/each_variation6.phpt @@ -4,7 +4,7 @@ Test each() function : usage variations - Internal array pointer <?php /* Prototype : array each(array $arr) * Description: Return the currently pointed key..value pair in the passed array, - * and advance the pointer to the next element + * and advance the pointer to the next element * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt index e7f312646e..3dfe1e821e 100644 --- a/ext/standard/tests/array/end.phpt +++ b/ext/standard/tests/array/end.phpt @@ -29,14 +29,14 @@ $arrays = array ( array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ), array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 ) ); -/* loop through $arrays to print the last element of each sub-array */ +/* loop through $arrays to print the last element of each sub-array */ echo "*** Testing end() on different arrays ***\n"; $counter = 1; foreach ($arrays as $sub_array){ echo "-- Iteration $counter --\n"; var_dump( end($sub_array) ); /* ensure that internal pointer is moved to last element */ - var_dump( current($sub_array) ); + var_dump( current($sub_array) ); $counter++; } @@ -50,19 +50,19 @@ var_dump( end($test_array[1]) ); echo "\n*** Testing end() when array elements are deleted ***\n"; $array_test = array("a", "b", "d", 7, "u" => "U", -4, "-.008" => "neg.008"); -// remove first element from array +// remove first element from array echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); @@ -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 9bfd03a88f..fbda85ea01 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -29,14 +29,14 @@ $arrays = array ( array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ), array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 ) ); -/* loop through $arrays to print the last element of each sub-array */ +/* loop through $arrays to print the last element of each sub-array */ echo "*** Testing end() on different arrays ***\n"; $counter = 1; foreach ($arrays as $sub_array){ echo "-- Iteration $counter --\n"; var_dump( end($sub_array) ); /* ensure that internal pointer is moved to last element */ - var_dump( current($sub_array) ); + var_dump( current($sub_array) ); $counter++; } @@ -50,19 +50,19 @@ var_dump( end($test_array[1]) ); echo "\n*** Testing end() when array elements are deleted ***\n"; $array_test = array("a", "b", "d", 7, "u" => "U", -4, "-.008" => "neg.008"); -// remove first element from array +// remove first element from array echo "\n-- Remove first element from array --\n"; unset($array_test[0]); var_dump( end($array_test) ); -// remove last element from array, rewind and check end() +// remove last element from array, rewind and check end() echo "\n-- Remove last element from array --\n"; unset($array_test['-.008']); var_dump( end($array_test) ); reset( $array_test ); var_dump( end($array_test) ); -// remove any element !first, !last, rewind and check end() +// remove any element !first, !last, rewind and check end() echo "\n-- Remove any element from array apart from first and last element --\n"; unset($array_test[7]); var_dump( end($array_test) ); @@ -229,7 +229,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..2e92587068 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test end() function : basic functionality +Test end() function : basic functionality --FILE-- <?php /* Prototype : mixed end(array $array_arg) - * Description: Advances array argument's internal pointer to the last element and return it + * Description: Advances array argument's internal pointer to the last element and return it * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/end_error.phpt index 9673a128ad..96e8429558 100644 --- a/ext/standard/tests/array/end_error.phpt +++ b/ext/standard/tests/array/end_error.phpt @@ -3,7 +3,7 @@ Test end() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : mixed end(array $array_arg) - * Description: Advances array argument's internal pointer to the last element and return it + * Description: Advances array argument's internal pointer to the last element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt index 3dffd793ca..a6f5ac1d1b 100644 --- a/ext/standard/tests/array/end_variation1.phpt +++ b/ext/standard/tests/array/end_variation1.phpt @@ -3,7 +3,7 @@ Test end() function : usage variations - Pass different data types as $array_arg --FILE-- <?php /* Prototype : mixed end(array $array_arg) - * Description: Advances array argument's internal pointer to the last element and return it + * Description: Advances array argument's internal pointer to the last element and return it * Source code: ext/standard/array.c */ @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..ea9c336ac0 100644 --- a/ext/standard/tests/array/end_variation2.phpt +++ b/ext/standard/tests/array/end_variation2.phpt @@ -3,7 +3,7 @@ Test end() function : usage variations - Multi-dimensional arrays --FILE-- <?php /* Prototype : mixed end(array $array_arg) - * Description: Advances array argument's internal pointer to the last element and return it + * Description: Advances array argument's internal pointer to the last element and return it * Source code: ext/standard/array.c */ @@ -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..cbc30212cd 100644 --- a/ext/standard/tests/array/end_variation3.phpt +++ b/ext/standard/tests/array/end_variation3.phpt @@ -3,7 +3,7 @@ Test end() function : usage variations - Referenced variables --FILE-- <?php /* Prototype : mixed end(array $array_arg) - * Description: Advances array argument's internal pointer to the last element and return it + * Description: Advances array argument's internal pointer to the last element and return it * Source code: ext/standard/array.c */ @@ -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 ffea1ef18c..d7e5fd7ac5 100644 --- a/ext/standard/tests/array/extract_error.phpt +++ b/ext/standard/tests/array/extract_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (error conditions) +Test extract() function (error conditions) --FILE-- <?php @@ -45,7 +45,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_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt index 0560e9e9c9..0e66c0e091 100644 --- a/ext/standard/tests/array/extract_variation1.phpt +++ b/ext/standard/tests/array/extract_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 1) +Test extract() function (variation 1) --FILE-- <?php diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt index bc0adf903e..2170b4f6b4 100644 --- a/ext/standard/tests/array/extract_variation10.phpt +++ b/ext/standard/tests/array/extract_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function - ensure EXTR_REFS doesn't mess with isRef flag on COW references to array elements. +Test extract() function - ensure EXTR_REFS doesn't mess with isRef flag on COW references to array elements. --FILE-- <?php $a = array('foo' => 'original.foo'); @@ -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..039d474f89 100644 --- a/ext/standard/tests/array/extract_variation11.phpt +++ b/ext/standard/tests/array/extract_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope. +Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope. --FILE-- <?php $a = array('foo' => 'original.foo'); @@ -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..5483fa0c9d 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 2) +Test extract() function (variation 2) --FILE-- <?php @@ -27,13 +27,13 @@ foreach ( $mixed_array as $sub_array ) { var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd")); var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss")); var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb")); - var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix + var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb")); } 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..1a6a088646 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 3) +Test extract() function (variation 3) --FILE-- <?php @@ -27,13 +27,13 @@ foreach ( $mixed_array as $sub_array ) { var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd")); var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss")); var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb")); - var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix + var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb")); } 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..31adb6e814 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 4) +Test extract() function (variation 4) --FILE-- <?php @@ -27,13 +27,13 @@ foreach ( $mixed_array as $sub_array ) { var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd")); var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss")); var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb")); - var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix + var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb")); } 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..f4455e9e57 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 5) +Test extract() function (variation 5) --FILE-- <?php @@ -26,13 +26,13 @@ foreach ( $mixed_array as $sub_array ) { var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd")); var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss")); var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb")); - var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix + var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "")); // "_" taken as default prefix var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb")); } 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..0c2243949a 100644 --- a/ext/standard/tests/array/extract_variation6.phpt +++ b/ext/standard/tests/array/extract_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 6) +Test extract() function (variation 6) --FILE-- <?php @@ -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..8104450df2 100644 --- a/ext/standard/tests/array/extract_variation7.phpt +++ b/ext/standard/tests/array/extract_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 7) +Test extract() function (variation 7) --FILE-- <?php @@ -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 0b33f63eb1..de9271a1cb 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 8) +Test extract() function (variation 8) --FILE-- <?php @@ -18,7 +18,7 @@ var_dump ( extract($var1)); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for Numerical prefixes *** int(3) int(1) diff --git a/ext/standard/tests/array/extract_variation9.phpt b/ext/standard/tests/array/extract_variation9.phpt index 1d4518bdf4..4d42a69762 100644 --- a/ext/standard/tests/array/extract_variation9.phpt +++ b/ext/standard/tests/array/extract_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test extract() function (variation 9) +Test extract() function (variation 9) --FILE-- <?php /* Using Class and objects */ diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt index 62b67c8db9..193b976e94 100644 --- a/ext/standard/tests/array/in_array_errors.phpt +++ b/ext/standard/tests/array/in_array_errors.phpt @@ -4,7 +4,7 @@ Test in_array() function : error conditions <?php /* * Prototype : bool in_array ( mixed $needle, array $haystack [, bool $strict] ) - * Description: Searches haystack for needle and returns TRUE + * Description: Searches haystack for needle and returns TRUE * if it is found in the array, FALSE otherwise. * Source Code: ext/standard/array.c */ @@ -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..45f18d0a10 100644 --- a/ext/standard/tests/array/in_array_variation1.phpt +++ b/ext/standard/tests/array/in_array_variation1.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - different needdle values <?php /* * Prototype : bool in_array ( mixed $needle, array $haystack [, bool $strict] ) - * Description: Searches haystack for needle and returns TRUE + * Description: Searches haystack for needle and returns TRUE * if it is found in the array, FALSE otherwise. * Source Code: ext/standard/array.c */ @@ -20,7 +20,7 @@ $arrays = array ( array(TRUE, FALSE), array("", array()), array("abcd\x00abcd\x00abcd"), - array("abcd\tabcd\nabcd\rabcd\0abcdefghij") + array("abcd\tabcd\nabcd\rabcd\0abcdefghij") ); $array_compare = array ( @@ -50,18 +50,18 @@ foreach($arrays as $array) { foreach($array_compare as $compare) { echo "-- Iteration $counter --\n"; //strict option OFF - var_dump(in_array($compare,$array)); + var_dump(in_array($compare,$array)); //strict option ON - var_dump(in_array($compare,$array,TRUE)); + var_dump(in_array($compare,$array,TRUE)); //strict option OFF - var_dump(in_array($compare,$array,FALSE)); + var_dump(in_array($compare,$array,FALSE)); $counter++; } } - + 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..1f42bb3f07 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - different haystack values <?php /* * Prototype : bool in_array ( mixed $needle, array $haystack [, bool $strict] ) - * Description: Searches haystack for needle and returns TRUE + * Description: Searches haystack for needle and returns TRUE * if it is found in the array, FALSE otherwise. * Source Code: ext/standard/array.c */ @@ -16,10 +16,10 @@ $misc_array = array ( 'a', 'key' =>'d', 3, - ".001" =>-67, + ".001" =>-67, "-.051" =>"k", 0.091 =>"-.08", - "e" =>"5", + "e" =>"5", "y" =>NULL, NULL =>"", 0, @@ -39,17 +39,17 @@ $counter = 1; foreach($array_type as $type) { echo "-- Iteration $counter --\n"; //loose type checking - var_dump( in_array($type,$misc_array ) ); + var_dump( in_array($type,$misc_array ) ); //strict type checking - var_dump( in_array($type,$misc_array,true) ); + var_dump( in_array($type,$misc_array,true) ); //loose type checking - var_dump( in_array($type,$misc_array,false) ); + var_dump( in_array($type,$misc_array,false) ); $counter++; } 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_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index f07d1dea89..c8b6445cd1 100644 --- a/ext/standard/tests/array/in_array_variation3.phpt +++ b/ext/standard/tests/array/in_array_variation3.phpt @@ -4,7 +4,7 @@ Test in_array() function : usage variations - haystack as sub-array/object <?php /* * Prototype : bool in_array ( mixed $needle, array $haystack [, bool $strict] ) - * Description: Searches haystack for needle and returns TRUE + * Description: Searches haystack for needle and returns TRUE * if it is found in the array, FALSE otherwise. * Source Code: ext/standard/array.c */ @@ -14,7 +14,7 @@ Test in_array() function : usage variations - haystack as sub-array/object /* checking for sub-arrays with in_array() */ echo "*** Testing sub-arrays with in_array() ***\n"; $sub_array = array ( - "one", + "one", array(1, 2 => "two", "three" => 3), 4 => "four", "five" => 5, @@ -22,7 +22,7 @@ $sub_array = array ( ); var_dump( in_array("four", $sub_array) ); //checking for element in a sub-array -var_dump( in_array(3, $sub_array[1]) ); +var_dump( in_array(3, $sub_array[1]) ); var_dump( in_array(array('','i'), $sub_array) ); /* checking for objects in in_array() */ @@ -36,11 +36,11 @@ class in_array_check { $in_array_obj = new in_array_check(); //creating new object //error: as wrong datatype for second argument -var_dump( in_array("array_var", $in_array_obj) ); +var_dump( in_array("array_var", $in_array_obj) ); //error: as wrong datatype for second argument -var_dump( in_array("foo", $in_array_obj) ); +var_dump( in_array("foo", $in_array_obj) ); //element found as "one" exists in array $array_var -var_dump( in_array("one", $in_array_obj->array_var) ); +var_dump( in_array("one", $in_array_obj->array_var) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index e166bdfad5..8301571940 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -4,12 +4,12 @@ Test in_array() function : usage variations - haystack as resource/multi dimensi <?php /* * Prototype : bool in_array ( mixed $needle, array $haystack [, bool $strict] ) - * Description: Searches haystack for needle and returns TRUE + * Description: Searches haystack for needle and returns TRUE * if it is found in the array, FALSE otherwise. * 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"; @@ -23,42 +23,42 @@ $dir_handle = opendir( dirname(__FILE__) ); $resources = array($file_handle, $dir_handle); // search for resouce type in the resource array -var_dump( in_array($file_handle, $resources, true) ); +var_dump( in_array($file_handle, $resources, true) ); //checking for (int) type resource -var_dump( in_array((int)$dir_handle, $resources, true) ); +var_dump( in_array((int)$dir_handle, $resources, true) ); /* Miscellenous input check */ echo "\n*** Testing miscelleneos inputs with in_array() ***\n"; //matching "Good" in array(0,"hello"), result:true in loose type check -var_dump( in_array("Good", array(0,"hello")) ); -//false in strict mode -var_dump( in_array("Good", array(0,"hello"), TRUE) ); +var_dump( in_array("Good", array(0,"hello")) ); +//false in strict mode +var_dump( in_array("Good", array(0,"hello"), TRUE) ); //matching integer 0 in array("this"), result:true in loose type check -var_dump( in_array(0, array("this")) ); +var_dump( in_array(0, array("this")) ); // false in strict mode -var_dump( in_array(0, array("this")),TRUE ); +var_dump( in_array(0, array("this")),TRUE ); //matching string "this" in array(0), result:true in loose type check -var_dump( in_array("this", array(0)) ); +var_dump( in_array("this", array(0)) ); // false in stric mode -var_dump( in_array("this", array(0), TRUE) ); +var_dump( in_array("this", array(0), TRUE) ); //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check -var_dump( in_array(FALSE, - array("a"=> TRUE, "b"=> TRUE, - array("c"=> TRUE, "d"=>TRUE) - ) - ) - ); +var_dump( in_array(FALSE, + array("a"=> TRUE, "b"=> TRUE, + array("c"=> TRUE, "d"=>TRUE) + ) + ) + ); //matching string having integer in beginning, result:true in loose type check -var_dump( in_array('123abc', array(123)) ); -var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode +var_dump( in_array('123abc', array(123)) ); +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..c626fd6872 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test key() function : basic functionality +Test key() function : basic functionality --FILE-- <?php /* Prototype : mixed key(array $array_arg) @@ -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..ebb5c25dd2 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -6,10 +6,10 @@ Francesco Fullone ff@ideato.it --FILE-- <?php echo "*** test key_exists() by calling it with its expected arguments ***\n"; -$a = array('bar' => 1); +$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_error.phpt b/ext/standard/tests/array/key_exists_error.phpt index a1af3910ba..1bbd41e20e 100644 --- a/ext/standard/tests/array/key_exists_error.phpt +++ b/ext/standard/tests/array/key_exists_error.phpt @@ -8,7 +8,7 @@ Francesco Fullone ff@ideato.it echo "*** Test by calling method or function with incorrect numbers of arguments ***\n"; -$a = array('bar' => 1); +$a = array('bar' => 1); var_dump(key_exists()); var_dump(key_exists('foo', $a, 'baz')); diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 0baa17eff7..65031f8240 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -6,10 +6,10 @@ Francesco Fullone ff@ideato.it --FILE-- <?php echo "*** test key_exists() by calling it with its expected arguments ***\n"; -$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); +$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 8afeaa8615..3409f36455 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -8,25 +8,25 @@ Francesco Fullone ff@ideato.it echo "*** test key_exists() by using mixed type of arrays ***\n"; // there is not a index = 0 element -$a = array(1 => 'bar', 'foo' => 'baz'); +$a = array(1 => 'bar', 'foo' => 'baz'); var_dump(key_exists(0, $a)); echo "integer\n"; // 1 has index = 0 -$b = array(1, 'foo' => 'baz'); +$b = array(1, 'foo' => 'baz'); var_dump(key_exists(0, $b)); // 42 has index = 0, netherless its position is the latest -$c = array('foo' => 'baz', 42); +$c = array('foo' => 'baz', 42); var_dump(key_exists(0, $c)); echo "string\n"; // 'bar' has index = 0, netherless it is a string -$d = array('bar', 'foo' => 'baz'); +$d = array('bar', 'foo' => 'baz'); var_dump(key_exists(0, $d)); // 'baz' has index = 0, netherless its position is the latest -$e = array('foo' => 'baz', 'baz'); +$e = array('foo' => 'baz', 'baz'); var_dump(key_exists(0, $e)); echo "obj\n"; @@ -38,24 +38,24 @@ class ObjectA $obj = new ObjectA(); // object has index = 0, netherless its position is the latest -$f = array('foo' => 'baz', $obj); +$f = array('foo' => 'baz', $obj); var_dump(key_exists(0, $f)); // object has index = 0, netherless its position is the first -$g = array($obj, 'foo' => 'baz'); +$g = array($obj, 'foo' => 'baz'); var_dump(key_exists(0, $g)); echo "stream resource\n"; // stream resource has index = 0, netherless its position is the first $st = fopen('php://memory', '+r'); -$h = array($st, 'foo' => 'baz'); +$h = array($st, 'foo' => 'baz'); var_dump(key_exists(0, $h)); // stream resource has index = 0, netherless its position is the latest -$i = array('foo' => 'baz', $st); +$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..9beb03e76b 100644 --- a/ext/standard/tests/array/key_variation1.phpt +++ b/ext/standard/tests/array/key_variation1.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations - Pass different data types as $array_arg --FILE-- <?php /* Prototype : mixed key(array $array_arg) - * Description: Return the key of the element currently pointed to by the internal array pointer + * Description: Return the key of the element currently pointed to by the internal array pointer * Source code: ext/standard/array.c */ @@ -59,7 +59,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -69,7 +69,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..912f9a69cb 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations --FILE-- <?php /* Prototype : mixed key(array $array_arg) - * Description: Return the key of the element currently pointed to by the internal array pointer + * Description: Return the key of the element currently pointed to by the internal array pointer * Source code: ext/standard/array.c */ @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -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..916e99af38 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations --FILE-- <?php /* Prototype : mixed key(array $array_arg) - * Description: Return the key of the element currently pointed to by the internal array pointer + * Description: Return the key of the element currently pointed to by the internal array pointer * Source code: ext/standard/array.c */ @@ -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..6698d6385a 100644 --- a/ext/standard/tests/array/key_variation4.phpt +++ b/ext/standard/tests/array/key_variation4.phpt @@ -3,7 +3,7 @@ Test key() function : usage variations --FILE-- <?php /* Prototype : mixed key(array $array_arg) - * Description: Return the key of the element currently pointed to by the internal array pointer + * Description: Return the key of the element currently pointed to by the internal array pointer * Source code: ext/standard/array.c */ @@ -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 6f00735913..6a3a40e3ad 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -1,14 +1,14 @@ --TEST-- -Test krsort() function : basic functionality +Test krsort() function : basic functionality --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation + * Description: Sort an array by key in reverse order, maintaining key to data correlation * Source code: ext/standard/array.c */ /* - * Testing krsort() by providing array of integer/string values to check the basic functionality + * Testing krsort() by providing array of integer/string values to check the basic functionality * with following flag values : * 1.flag value as defualt * 2.SORT_REGULAR - compare items normally @@ -18,14 +18,14 @@ Test krsort() function : basic functionality echo "*** Testing krsort() : basic functionality ***\n"; -// an array containing unsorted string values with indices -$unsorted_strings = array( "lemon" => "l", "orange" => "o", "banana" => "b" ); +// an array containing unsorted string values with indices +$unsorted_strings = array( "lemon" => "l", "orange" => "o", "banana" => "b" ); $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 ); echo "\n-- Testing krsort() by supplying string array, 'flag' value is defualt --\n"; @@ -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_error.phpt b/ext/standard/tests/array/krsort_error.phpt index 250d9da03b..1bca5f928d 100644 --- a/ext/standard/tests/array/krsort_error.phpt +++ b/ext/standard/tests/array/krsort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test krsort() function : error conditions +Test krsort() function : error conditions --FILE-- <?php /* Prototype : bool krsort(array &array_arg [, int asort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ /* -* Testing krsort() function with all possible error conditions +* Testing krsort() function with all possible error conditions */ echo "*** Testing krsort() : error conditions ***\n"; @@ -28,7 +28,7 @@ foreach($flags as $key => $flag){ echo "\n- Sort flag = $key -\n"; $temp_array = $array_arg; var_dump( krsort($temp_array,$flag, $extra_arg) ); - var_dump($temp_array); + var_dump($temp_array); } echo "Done"; diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt index 308be2cc26..6236595796 100644 --- a/ext/standard/tests/array/krsort_object.phpt +++ b/ext/standard/tests/array/krsort_object.phpt @@ -3,7 +3,7 @@ Test krsort() function : object functionality - sort objects --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation + * Description: Sort an array by key in reverse order, maintaining key to data correlation * Source code: ext/standard/array.c */ /* @@ -41,14 +41,14 @@ class StringObject } // array of integer objects with different key values -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 10 => new IntegerObject(11), 20 => new IntegerObject(66), 3 => new IntegerObject(23), 4 => new IntegerObject(-5), 50 => new IntegerObject(0.001), 6 => new IntegerObject(0) ); // array of string objects with different key values -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index 9a30c4ec1e..86d6a3eacb 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of krsort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { @@ -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 -- diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index 32e9b8b3ef..467fb88e4d 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test krsort() function : usage variations - sort heredoc strings +Test krsort() function : usage variations - sort heredoc strings --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) @@ -32,7 +32,7 @@ Test this!!! EOT; $array = array ( - $simple_heredoc1 => "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); @@ -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 0cfa4821a2..f16e438335 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..fc113ff30a 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - unexpected values for 'sort_flags' a --FILE-- <?php /* Prototype : bool krsort(array &array_arg [, int sort_flags]) - * Description: Sort an array by key in reverse order, maintaining key to data correlation + * Description: Sort an array by key in reverse order, maintaining key to data correlation * Source code: ext/standard/array.c */ @@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( krsort($temp_array, $value) ); + var_dump( krsort($temp_array, $value) ); var_dump($temp_array); $counter++; } @@ -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]=> @@ -270,7 +270,7 @@ array(3) { } -- Iteration 18 -- -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]=> @@ -282,7 +282,7 @@ array(3) { } -- Iteration 19 -- -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]=> @@ -294,7 +294,7 @@ array(3) { } -- 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..0707c610cb 100644 --- a/ext/standard/tests/array/krsort_variation3.phpt +++ b/ext/standard/tests/array/krsort_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test krsort() function : usage variations - sort integer/float values +Test krsort() function : usage variations - sort integer/float values --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation + * Description: Sort an array by key in reverse order, maintaining key to data correlation * Source code: ext/standard/array.c */ @@ -23,7 +23,7 @@ $various_arrays = array( array(1 => 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41), // float key values - array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), + array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), // mixed value array with different types of keys array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2, @@ -40,24 +40,24 @@ echo "\n-- Testing krsort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(krsort($temp_array) ); var_dump($temp_array); // loop through $flags array and call krsort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(krsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} 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..5643b39f58 100644 --- a/ext/standard/tests/array/krsort_variation4.phpt +++ b/ext/standard/tests/array/krsort_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test krsort() function : usage variations - sort octal values +Test krsort() function : usage variations - sort octal values --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation. + * Description: Sort an array by key in reverse order, maintaining key to data correlation. * Source code: ext/standard/array.c */ @@ -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..2fa16c6e73 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing krsort() : usage variations ***\n"; $various_arrays = array ( // diff. escape sequence chars with key values - array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) @@ -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..72f4e41720 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort hexadecimal values --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation. + * Description: Sort an array by key in reverse order, maintaining key to data correlation. * Source code: ext/standard/array.c */ @@ -17,8 +17,8 @@ Test krsort() function : usage variations - sort hexadecimal values echo "*** Testing krsort() : usage variations ***\n"; -// an array containing unsorted hexadecimal values with keys -$unsorted_hex_array = array ( +// an array containing unsorted hexadecimal values with keys +$unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); @@ -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..b0512935dc 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -1,14 +1,14 @@ --TEST-- -Test krsort() function : usage variations - sort array with diff. sub arrays +Test krsort() function : usage variations - sort array with diff. sub arrays --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation + * Description: Sort an array by key, maintaining key to data correlation * Source code: ext/standard/array.c */ /* - * testing krsort() by providing arrays contains sub arrays for $array argument + * testing krsort() by providing arrays contains sub arrays for $array argument * with flowing flag values * 1.flag value as defualt * 2.SORT_REGULAR - compare items normally @@ -16,7 +16,7 @@ Test krsort() function : usage variations - sort array with diff. sub arrays echo "*** Testing krsort() : usage variations ***\n"; -// array with diff sub arrays to be sorted +// array with diff sub arrays to be sorted $various_arrays = array ( // null array 1 => array(), @@ -28,7 +28,7 @@ $various_arrays = array ( 3 => array(4 => 44, 1 => 11, 3 => array(64,61) ), // array contains sub arrays - 4 => array ( 3 => array(33,-5,6), 1 => array(11), + 4 => array ( 3 => array(33,-5,6), 1 => array(11), 2 => array(22,-55), 0 => array() ) ); @@ -38,8 +38,8 @@ echo "\n-- Testing krsort() by supplying various arrays containing sub arrays -- // loop through to test krsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( krsort($temp_array) ); @@ -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..3dd33157ec 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..f3e510f8be 100644 --- a/ext/standard/tests/array/krsort_variation9.phpt +++ b/ext/standard/tests/array/krsort_variation9.phpt @@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort array with/without key values --FILE-- <?php /* Prototype : bool krsort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key in reverse order, maintaining key to data correlation. + * Description: Sort an array by key in reverse order, maintaining key to data correlation. * Source code: ext/standard/array.c */ @@ -30,7 +30,7 @@ $various_arrays = array ( $count = 1; echo "\n-- Testing krsort() by supplying various arrays with/without key values --\n"; -// loop through to test krsort() with different arrays, +// loop through to test krsort() with different arrays, foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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 c883758813..59241bb6c8 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ksort() function : basic functionality +Test ksort() function : basic functionality --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation + * Description: Sort an array by key, maintaining key to data correlation * Source code: ext/standard/array.c */ @@ -17,13 +17,13 @@ Test ksort() function : basic functionality echo "*** Testing ksort() : basic functionality ***\n"; -// an array containing unsorted string values with indices +// an array containing unsorted string values with indices $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); -// an array containing unsorted numeric values with indices +// an array containing unsorted numeric values with indices $unsorted_numerics = array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 ); echo "\n-- Testing ksort() by supplying string array, 'flag' value is defualt --\n"; @@ -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_error.phpt b/ext/standard/tests/array/ksort_error.phpt index 7631e9ee0e..f2b102ae01 100644 --- a/ext/standard/tests/array/ksort_error.phpt +++ b/ext/standard/tests/array/ksort_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ksort() function : error conditions +Test ksort() function : error conditions --FILE-- <?php /* Prototype : bool ksort(array &array_arg [, int sort_flags]) @@ -8,7 +8,7 @@ Test ksort() function : error conditions */ /* -* Testing ksort() function with all possible error conditions +* Testing ksort() function with all possible error conditions */ echo "*** Testing ksort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/ksort_object.phpt index e193032788..2d76026aa4 100644 --- a/ext/standard/tests/array/ksort_object.phpt +++ b/ext/standard/tests/array/ksort_object.phpt @@ -3,13 +3,13 @@ Test ksort() function : object functionality - sort objects --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation. + * Description: Sort an array by key, maintaining key to data correlation. * Source code: ext/standard/array.c */ /* - * testing ksort() by providing array ofinteger/string objects with following flag values: + * testing ksort() by providing array ofinteger/string objects with following flag values: * 1.SORT_NUMERIC - compare items numerically - * 2.SORT_STRING - compare items as strings + * 2.SORT_STRING - compare items as strings */ echo "*** Testing ksort() : object functionality ***\n"; @@ -42,14 +42,14 @@ class StringObject } // array of integer objects -$unsorted_int_obj = array ( +$unsorted_int_obj = array ( 11 => new IntegerObject(11), 66 => new IntegerObject(66), 23 => new IntegerObject(23), -5 => new IntegerObject(-5), 1 => new IntegerObject(0.001), 0 => new IntegerObject(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( "axx" => new StringObject("axx"), "t" => new StringObject("t"), "w" => new StringObject("w"), "py" => new StringObject("py"), "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"), diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index df3b294240..d11c9a5290 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( // loop though each element of the array and check the working of ksort() // when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { @@ -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 -- diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 1037042a7f..844685b36a 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ksort() function : usage variations - sort octal values +Test ksort() function : usage variations - sort octal values --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation. + * Description: Sort an array by key, maintaining key to data correlation. * Source code: ext/standard/array.c */ @@ -17,8 +17,8 @@ Test ksort() function : usage variations - sort octal values echo "*** Testing ksort() : usage variations ***\n"; // an array containing unsorted octal values -$unsorted_oct_array = array ( - 01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, +$unsorted_oct_array = array ( + 01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, 077 => 06, -066 => -01, -0345 => -02, 0 => 0 ); @@ -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..758821303b 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ksort() function : usage variations - sort heredoc strings +Test ksort() function : usage variations - sort heredoc strings --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) @@ -17,7 +17,7 @@ Test ksort() function : usage variations - sort heredoc strings echo "*** Testing ksort() : usage variations ***\n"; -// Different heredoc strings to be sorted +// Different heredoc strings to be sorted $simple_heredoc1 =<<<EOT Heredoc EOT; @@ -32,7 +32,7 @@ Test this!!! EOT; $array = array ( - $simple_heredoc1 => "Heredoc", + $simple_heredoc1 => "Heredoc", $simple_heredoc2 => "HEREDOC", $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!" ); @@ -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..fb1371a985 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -3,7 +3,7 @@ Test ksort() function : usage variations - unexpected values for 'sort_flags' ar --FILE-- <?php /* Prototype : bool ksort(array &array_arg [, int sort_flags]) - * Description: Sort an array by key, maintaining key to data correlation + * Description: Sort an array by key, maintaining key to data correlation * Source code: ext/standard/array.c */ @@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) { echo "-- Iteration $counter --\n"; $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( ksort($temp_array, $value) ); + var_dump( ksort($temp_array, $value) ); var_dump($temp_array); $counter++; } @@ -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]=> @@ -270,7 +270,7 @@ array(3) { } -- Iteration 18 -- -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]=> @@ -282,7 +282,7 @@ array(3) { } -- Iteration 19 -- -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]=> @@ -294,7 +294,7 @@ array(3) { } -- 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..691672f780 100644 --- a/ext/standard/tests/array/ksort_variation3.phpt +++ b/ext/standard/tests/array/ksort_variation3.phpt @@ -3,7 +3,7 @@ Test ksort() function : usage variations - sort integer/float values --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation + * Description: Sort an array by key, maintaining key to data correlation * Source code: ext/standard/array.c */ @@ -23,10 +23,10 @@ $various_arrays = array( array(1 => 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41), // float key values - array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), + array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), // mixed value array with different types of keys - array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, + array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2, -10 => -10.6E-2, 11 => 33) ); @@ -40,24 +40,24 @@ echo "\n-- Testing ksort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With defualt sort flag -\n"; - $temp_array = $array; + echo "- With defualt sort flag -\n"; + $temp_array = $array; var_dump(ksort($temp_array) ); var_dump($temp_array); // loop through $flags array and call ksort() with all possible sort flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(ksort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} 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..bc0c4be3b8 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -24,13 +24,13 @@ echo "*** Testing ksort() : usage variations ***\n"; $various_arrays = array ( // diff. escape sequence chars with key values - array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", - "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", + array ( null => null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", + "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", "\ddd" => "\ddd", "\v" => "\v" ), // array containing different strings with key values - array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", + array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe", 'B' => "BANANA" ) @@ -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..32fd973d8f 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ksort() function : usage variations - sort hexadecimal values +Test ksort() function : usage variations - sort hexadecimal values --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation. + * Description: Sort an array by key, maintaining key to data correlation. * Source code: ext/standard/array.c */ @@ -16,9 +16,9 @@ Test ksort() function : usage variations - sort hexadecimal values echo "*** Testing ksort() : usage variations ***\n"; -// an array containng unsorted hexadecimal values with keys +// an array containng unsorted hexadecimal values with keys // There are multiple keys which are duplicate and the later should be picked -$unsorted_hex_array = array ( +$unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, 0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa ); @@ -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..18dc3a03ab 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -1,14 +1,14 @@ --TEST-- -Test ksort() function : usage variations - sort array with diff. sub arrays +Test ksort() function : usage variations - sort array with diff. sub arrays --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation + * Description: Sort an array by key, maintaining key to data correlation * Source code: ext/standard/array.c */ /* - * testing ksort() by providing arrays containing sub arrays for $array argument + * testing ksort() by providing arrays containing sub arrays for $array argument * with flowing flag values: * 1. flag value as defualt * 2. SORT_REGULAR - compare items normally @@ -16,7 +16,7 @@ Test ksort() function : usage variations - sort array with diff. sub arrays echo "*** Testing ksort() : usage variations ***\n"; -// array with diff sub arrays to be sorted +// array with diff sub arrays to be sorted $various_arrays = array ( // null array 1 => array(), @@ -28,7 +28,7 @@ $various_arrays = array ( 3 => array(4 => 44, 1 => 11, 3 => array(64,61) ), // array contains sub arrays - 4 => array ( 3 => array(33,-5,6), 1 => array(11), + 4 => array ( 3 => array(33,-5,6), 1 => array(11), 2 => array(22,-55), 0 => array() ) ); @@ -38,8 +38,8 @@ echo "\n-- Testing ksort() by supplying various arrays containing sub arrays --\ // loop through to test ksort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; echo "- With defualt sort flag -\n"; $temp_array = $array; var_dump( ksort($temp_array) ); @@ -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..ca9dfdbe9e 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..e78ea3bef0 100644 --- a/ext/standard/tests/array/ksort_variation9.phpt +++ b/ext/standard/tests/array/ksort_variation9.phpt @@ -3,12 +3,12 @@ Test ksort() function : usage variations - sorting arrays with/without keys --FILE-- <?php /* Prototype : bool ksort ( array &$array [, int $sort_flags] ) - * Description: Sort an array by key, maintaining key to data correlation. + * Description: Sort an array by key, maintaining key to data correlation. * Source code: ext/standard/array.c */ /* - * Testing ksort() by providing arrays with/without key values for $array argument with following flag values: + * Testing ksort() by providing arrays with/without key values for $array argument with following flag values: * 1.flag value as defualt * 2.SORT_REGULAR - compare items normally */ @@ -29,7 +29,7 @@ $various_arrays = array ( $count = 1; echo "\n-- Testing ksort() by supplying various arrays with/without key values --\n"; -// loop through to test ksort() with different arrays, +// loop through to test ksort() with different arrays, foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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/max.phpt b/ext/standard/tests/array/max.phpt index ae4f304eae..555d2d04c8 100644 --- a/ext/standard/tests/array/max.phpt +++ b/ext/standard/tests/array/max.phpt @@ -19,7 +19,7 @@ var_dump(max(0, true, false, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: max() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt index c880810cb3..f304212293 100644 --- a/ext/standard/tests/array/max_basic.phpt +++ b/ext/standard/tests/array/max_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing sequences of numbers ***\n"; diff --git a/ext/standard/tests/array/max_basiclong_64bit.phpt b/ext/standard/tests/array/max_basiclong_64bit.phpt index 95116b16c2..1eb7e31cdc 100644 --- a/ext/standard/tests/array/max_basiclong_64bit.phpt +++ b/ext/standard/tests/array/max_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -MAX_64Bit - 1); @@ -25,8 +25,8 @@ $longVals = array( ); var_dump(max($arrayVals)); - var_dump(max($longVals)); - + var_dump(max($longVals)); + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/max_error.phpt b/ext/standard/tests/array/max_error.phpt index a8736a3d88..b20a3c08f6 100644 --- a/ext/standard/tests/array/max_error.phpt +++ b/ext/standard/tests/array/max_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing Error Conditions ***\n"; diff --git a/ext/standard/tests/array/max_variation1.phpt b/ext/standard/tests/array/max_variation1.phpt index 44fa010c31..a32ceb8fc2 100644 --- a/ext/standard/tests/array/max_variation1.phpt +++ b/ext/standard/tests/array/max_variation1.phpt @@ -2,10 +2,10 @@ Test variations in usage of max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing boundary conditions ***\n"; var_dump(max(2147483645, 2147483646) ); diff --git a/ext/standard/tests/array/max_variation2.phpt b/ext/standard/tests/array/max_variation2.phpt index a020d5e422..9abcda53c3 100644 --- a/ext/standard/tests/array/max_variation2.phpt +++ b/ext/standard/tests/array/max_variation2.phpt @@ -2,10 +2,10 @@ Test variations in usage of max() --FILE-- <?php -/* +/* * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing arrays ***\n"; diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt index cb8c7cfdca..3a77ee8a0d 100644 --- a/ext/standard/tests/array/min.phpt +++ b/ext/standard/tests/array/min.phpt @@ -19,7 +19,7 @@ var_dump(min(0, true, false, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: min() expects at least 1 parameter, 0 given in %s on line 3 NULL diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt index f76770f40d..34f853fedb 100644 --- a/ext/standard/tests/array/min_basic.phpt +++ b/ext/standard/tests/array/min_basic.phpt @@ -2,10 +2,10 @@ Test return type and value for expected input min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing sequences of numbers ***\n"; diff --git a/ext/standard/tests/array/min_basiclong_64bit.phpt b/ext/standard/tests/array/min_basiclong_64bit.phpt index 526d77a27a..52f63f3916 100644 --- a/ext/standard/tests/array/min_basiclong_64bit.phpt +++ b/ext/standard/tests/array/min_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -MAX_64Bit - 1); @@ -25,8 +25,8 @@ $longVals = array( ); var_dump(min($arrayVals)); - var_dump(min($longVals)); - + var_dump(min($longVals)); + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/array/min_error.phpt b/ext/standard/tests/array/min_error.phpt index deb84f276d..dc472bc258 100644 --- a/ext/standard/tests/array/min_error.phpt +++ b/ext/standard/tests/array/min_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing Error Conditions ***\n"; diff --git a/ext/standard/tests/array/min_variation1.phpt b/ext/standard/tests/array/min_variation1.phpt index a9c31f615f..9e24bd66a1 100644 --- a/ext/standard/tests/array/min_variation1.phpt +++ b/ext/standard/tests/array/min_variation1.phpt @@ -2,10 +2,10 @@ Test variations in usage of min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing boundary conditions ***\n"; var_dump(min(2147483645, 2147483646) ); diff --git a/ext/standard/tests/array/min_variation2.phpt b/ext/standard/tests/array/min_variation2.phpt index eff810e869..a8b215209f 100644 --- a/ext/standard/tests/array/min_variation2.phpt +++ b/ext/standard/tests/array/min_variation2.phpt @@ -2,10 +2,10 @@ Test variations in usage of min() --FILE-- <?php -/* +/* * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]]) * Function is implemented in ext/standard/array.c -*/ +*/ echo "\n*** Testing arrays ***\n"; diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt index a2bee69829..ba23353503 100644 --- a/ext/standard/tests/array/natcasesort_basic.phpt +++ b/ext/standard/tests/array/natcasesort_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test natcasesort() function : basic functionality +Test natcasesort() function : basic functionality --FILE-- <?php /* Prototype : bool natcasesort(array &$array_arg) @@ -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_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt index ec733adaf9..aab98a45d8 100644 --- a/ext/standard/tests/array/natcasesort_object1.phpt +++ b/ext/standard/tests/array/natcasesort_object1.phpt @@ -32,7 +32,7 @@ class for_string_natcasesort // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_natcasesort("axx"), new for_string_natcasesort("t"), new for_string_natcasesort("w"), new for_string_natcasesort("py"), new for_string_natcasesort("apple"), new for_string_natcasesort("Orange"), diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt index 347522063d..1537550f4c 100644 --- a/ext/standard/tests/array/natcasesort_variation1.phpt +++ b/ext/standard/tests/array/natcasesort_variation1.phpt @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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 cffa007b74..15fbfd911b 100644 --- a/ext/standard/tests/array/natcasesort_variation10.phpt +++ b/ext/standard/tests/array/natcasesort_variation10.phpt @@ -28,7 +28,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 af501f07bc..ac19cb3950 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -39,7 +39,7 @@ $inputs = array( -10.5 => 'negative', .5 => 'half', ), - + /*3*/ 'extreme floats' => array( 12.3456789000e6 => 'large', 12.3456789000E-10 => 'small', @@ -48,8 +48,8 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), - + ), + /*5*/ 'null lowercase' => array( null => 'null 2', ), @@ -59,17 +59,17 @@ $inputs = array( true => 'lowert', false => 'lowerf', ), - + /*7*/ 'bool uppercase' => array( TRUE => 'uppert', FALSE => 'upperf', ), - + // empty data /*8*/ 'empty double quotes' => array( "" => 'emptyd', ), - + /*9*/ 'empty single quotes' => array( '' => 'emptys', ), @@ -90,14 +90,14 @@ $inputs = array( /*12*/ 'unset' => array( @$unset_var => 'unset', ), - + // duplicate values /*13*/ 'duplicate' => array( 'foo' => 'bar', 'baz' => 'bar', 'hello' => 'world' ), - + ); // loop through each element of $inputs to check the behavior of natcasesort() @@ -112,7 +112,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt index a38dbedfe4..8a05c12f93 100644 --- a/ext/standard/tests/array/natcasesort_variation2.phpt +++ b/ext/standard/tests/array/natcasesort_variation2.phpt @@ -67,13 +67,13 @@ $inputs = array( TRUE, FALSE, ), - + // empty data /*5*/ 'empty string' => array( "", '', ), - + /*6*/ 'empty array' => array( ), @@ -83,7 +83,7 @@ $inputs = array( 'string', $heredoc, ), - + // object data /*8*/ 'object' => array( new classA(), diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 31b0d47ae9..be7495418d 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -27,7 +27,7 @@ $inputs = array ( // mixed value array array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33), - + // array values contains minimum and maximum ranges array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649) ); @@ -42,7 +42,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 867d0b89e4..71559afa23 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 1d151d80d3..e87fb27a64 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 fbced4a229..48f347837c 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 8929e40784..dc5b5f4203 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..e502d8646e 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test next() function : basic functionality +Test next() function : basic functionality --FILE-- <?php /* Prototype : mixed next(array $array_arg) - * Description: Move array argument's internal pointer to the next element and return it + * Description: Move array argument's internal pointer to the next element and return it * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/next_error.phpt index 11e7cb12de..f7b78357cb 100644 --- a/ext/standard/tests/array/next_error.phpt +++ b/ext/standard/tests/array/next_error.phpt @@ -3,7 +3,7 @@ Test next() function : error conditions - Pass incorrect number of arguments --FILE-- <?php /* Prototype : mixed next(array $array_arg) - * Description: Move array argument's internal pointer to the next element and return it + * Description: Move array argument's internal pointer to the next element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt index b87f3f9e15..027a521471 100644 --- a/ext/standard/tests/array/next_variation1.phpt +++ b/ext/standard/tests/array/next_variation1.phpt @@ -3,7 +3,7 @@ Test next() function : usage variation - Pass different data types as $array_arg --FILE-- <?php /* Prototype : mixed next(array $array_arg) - * Description: Move array argument's internal pointer to the next element and return it + * Description: Move array argument's internal pointer to the next element and return it * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..1ecde7efce 100644 --- a/ext/standard/tests/array/next_variation2.phpt +++ b/ext/standard/tests/array/next_variation2.phpt @@ -3,7 +3,7 @@ Test next() function : usage variation - Mulit-dimensional arrays --FILE-- <?php /* Prototype : mixed next(array $array_arg) - * Description: Move array argument's internal pointer to the next element and return it + * Description: Move array argument's internal pointer to the next element and return it * Source code: ext/standard/array.c */ @@ -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..f3c91cafc3 100644 --- a/ext/standard/tests/array/prev_basic.phpt +++ b/ext/standard/tests/array/prev_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test prev() function : basic functionality +Test prev() function : basic functionality --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ @@ -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_error1.phpt b/ext/standard/tests/array/prev_error1.phpt index 0b9b15814e..bea245196e 100644 --- a/ext/standard/tests/array/prev_error1.phpt +++ b/ext/standard/tests/array/prev_error1.phpt @@ -3,7 +3,7 @@ Test prev() function : error conditions - Pass incorrect number of arguments --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/prev_error2.phpt b/ext/standard/tests/array/prev_error2.phpt index 37049cf854..851cf0a949 100644 --- a/ext/standard/tests/array/prev_error2.phpt +++ b/ext/standard/tests/array/prev_error2.phpt @@ -3,7 +3,7 @@ prev - ensure warning is received when passing an indirect temporary. --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/prev_error3.phpt b/ext/standard/tests/array/prev_error3.phpt index 8f91507131..dfac24eacb 100644 --- a/ext/standard/tests/array/prev_error3.phpt +++ b/ext/standard/tests/array/prev_error3.phpt @@ -3,7 +3,7 @@ prev - ensure we cannot pass a temporary --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt index 6d1a79409f..257206b410 100644 --- a/ext/standard/tests/array/prev_variation1.phpt +++ b/ext/standard/tests/array/prev_variation1.phpt @@ -3,7 +3,7 @@ Test prev() function : usage variation - Pass different data types as $array_arg --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..8e8ee4d673 100644 --- a/ext/standard/tests/array/prev_variation2.phpt +++ b/ext/standard/tests/array/prev_variation2.phpt @@ -3,7 +3,7 @@ Test prev() function : usage variation - Multi-dimensional arrays --FILE-- <?php /* Prototype : mixed prev(array $array_arg) - * Description: Move array argument's internal pointer to the previous element and return it + * Description: Move array argument's internal pointer to the previous element and return it * Source code: ext/standard/array.c */ @@ -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..ebb496c74a 100644 --- a/ext/standard/tests/array/range.phpt +++ b/ext/standard/tests/array/range.phpt @@ -13,13 +13,13 @@ var_dump( range(1, 10) ); echo "\n-- An array of elements from high to low --\n"; var_dump( range(10, 1) ); -echo "\n-- Numeric Strings as Low and High --\n"; +echo "\n-- Numeric Strings as Low and High --\n"; echo "-- An array of elements from low to high --\n"; var_dump( range("1", "10") ); echo "\n-- An array of elements from high to low --\n"; var_dump( range("10", "1") ); -echo "\n-- Chars as Low and High --\n"; +echo "\n-- Chars as Low and High --\n"; echo "-- An array of elements from low to high --\n"; var_dump( range("a", "z") ); echo "\n-- An array of elements from high to low --\n"; @@ -29,26 +29,26 @@ echo "\n-- Low and High are equal --\n"; var_dump( range(5, 5) ); var_dump( range("q", "q") ); -echo "\n-- floats as Low and High --\n"; +echo "\n-- floats as Low and High --\n"; var_dump( range(5.1, 10.1) ); var_dump( range(10.1, 5.1) ); var_dump( range("5.1", "10.1") ); var_dump( range("10.1", "5.1") ); -echo "\n-- Passing step with Low and High --\n"; +echo "\n-- Passing step with Low and High --\n"; var_dump( range(1, 2, 0.1) ); var_dump( range(2, 1, 0.1) ); var_dump( range(1, 2, "0.1") ); -var_dump( range("1", "2", 0.1) ); +var_dump( range("1", "2", 0.1) ); echo "\n-- Testing basic string with step --\n"; 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_errors.phpt b/ext/standard/tests/array/range_errors.phpt index b63e9874bf..45c30f5acf 100644 --- a/ext/standard/tests/array/range_errors.phpt +++ b/ext/standard/tests/array/range_errors.phpt @@ -7,7 +7,7 @@ precision=14 echo "\n*** Testing error conditions ***\n"; -echo "\n-- Testing ( (low < high) && (step = 0) ) --"; +echo "\n-- Testing ( (low < high) && (step = 0) ) --"; var_dump( range(1, 2, 0) ); var_dump( range("a", "b", 0) ); @@ -21,11 +21,11 @@ var_dump( range(1.0, 7.0, 6.5) ); echo "\n\n-- Testing ( (low > high) && (low-high < step) ) --"; var_dump( range(7.0, 1.0, 6.5) ); -echo "\n-- Testing Invalid number of arguments --"; +echo "\n-- Testing Invalid number of arguments --"; var_dump( range() ); // No.of args = 0 var_dump( range(1) ); // No.of args < expected var_dump( range(1,2,3,4) ); // No.of args > expected -var_dump( range(-1, -2, 2) ); +var_dump( range(-1, -2, 2) ); var_dump( range("a", "j", "z") ); var_dump( range(0, 1, "140962482048819216326.24") ); var_dump( range(0, 1, "140962482048819216326.24.") ); 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..52e3cf55f4 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -3,7 +3,7 @@ Test reset() function : basic functionality --FILE-- <?php /* Prototype : mixed reset(array $array_arg) - * Description: Set array argument's internal pointer to the first element and return it + * Description: Set array argument's internal pointer to the first element and return it * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/reset_error.phpt index abab8af635..c71608112c 100644 --- a/ext/standard/tests/array/reset_error.phpt +++ b/ext/standard/tests/array/reset_error.phpt @@ -3,7 +3,7 @@ Test reset() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : mixed reset(array $array_arg) - * Description: Set array argument's internal pointer to the first element and return it + * Description: Set array argument's internal pointer to the first element and return it * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt index 51fb7cd431..6181bd4177 100644 --- a/ext/standard/tests/array/reset_variation1.phpt +++ b/ext/standard/tests/array/reset_variation1.phpt @@ -3,7 +3,7 @@ Test reset() function : usage variations - Pass different data types as $array_a --FILE-- <?php /* Prototype : mixed reset(array $array_arg) - * Description: Set array argument's internal pointer to the first element and return it + * Description: Set array argument's internal pointer to the first element and return it * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -68,7 +68,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..6ecc1ad683 100644 --- a/ext/standard/tests/array/reset_variation2.phpt +++ b/ext/standard/tests/array/reset_variation2.phpt @@ -3,7 +3,7 @@ Test reset() function : usage variations - unset first element --FILE-- <?php /* Prototype : mixed reset(array $array_arg) - * Description: Set array argument's internal pointer to the first element and return it + * Description: Set array argument's internal pointer to the first element and return it * Source code: ext/standard/array.c */ @@ -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..7ac859c1c3 100644 --- a/ext/standard/tests/array/reset_variation3.phpt +++ b/ext/standard/tests/array/reset_variation3.phpt @@ -3,12 +3,12 @@ Test reset() function : usage variations - Referenced variables --FILE-- <?php /* Prototype : mixed reset(array $array_arg) - * Description: Set array argument's internal pointer to the first element and return it + * Description: Set array argument's internal pointer to the first element and return it * Source code: ext/standard/array.c */ /* - * Reference two arrays to each other then call reset() to test position of + * Reference two arrays to each other then call reset() to test position of * internal pointer in both arrays */ @@ -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 9d11b022b7..724aa2d3a8 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test rsort() function : basic functionality +Test rsort() function : basic functionality --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -13,13 +13,13 @@ Test rsort() function : basic functionality echo "*** Testing rsort() : basic functionality ***\n"; -// associative array containing unsorted string values +// associative array containing unsorted string values $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); @@ -71,7 +71,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_error.phpt b/ext/standard/tests/array/rsort_error.phpt index 247ec79cb2..6f6f2f9762 100644 --- a/ext/standard/tests/array/rsort_error.phpt +++ b/ext/standard/tests/array/rsort_error.phpt @@ -3,7 +3,7 @@ Test rsort() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/rsort_object1.phpt index dbaf1751f0..98f7cfec16 100644 --- a/ext/standard/tests/array/rsort_object1.phpt +++ b/ext/standard/tests/array/rsort_object1.phpt @@ -3,7 +3,7 @@ Test rsort() function : object functionality --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -41,14 +41,14 @@ class for_string_rsort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_rsort(11), new for_integer_rsort(66), new for_integer_rsort(23), new for_integer_rsort(-5), new for_integer_rsort(0.001), new for_integer_rsort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_rsort("axx"), new for_string_rsort("t"), new for_string_rsort("w"), new for_string_rsort("py"), new for_string_rsort("apple"), new for_string_rsort("Orange"), diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt index 75a8fbb7ab..57acdc61fe 100644 --- a/ext/standard/tests/array/rsort_object2.phpt +++ b/ext/standard/tests/array/rsort_object2.phpt @@ -3,7 +3,7 @@ Test rsort() function : object functionality - different visibilities --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -51,7 +51,7 @@ class for_string_rsort // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_rsort(11,33,30), new for_integer_rsort(66,44,4), new for_integer_rsort(-88,-5,5), @@ -59,8 +59,8 @@ $unsorted_int_obj = array( ); // array of string objects -$unsorted_str_obj = array ( - new for_string_rsort("axx","AXX","ass"), +$unsorted_str_obj = array ( + new for_string_rsort("axx","AXX","ass"), new for_string_rsort("t","eee","abb"), new for_string_rsort("w","W", "c"), new for_string_rsort("py","PY", "pt"), diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt index 17c0385eed..ab05a250c6 100644 --- a/ext/standard/tests/array/rsort_variation1.phpt +++ b/ext/standard/tests/array/rsort_variation1.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - Pass different data types as $array_a --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -67,7 +67,7 @@ $inputs = array( /*18*/ "string", 'string', $heredoc, - + // object data /*21*/ new classA(), @@ -106,70 +106,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: @@ -293,70 +293,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 f057c9e065..bcb184e84e 100644 --- a/ext/standard/tests/array/rsort_variation10.phpt +++ b/ext/standard/tests/array/rsort_variation10.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - Octal values --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -34,7 +34,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..076a906599 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 c3990ccd20..8b4a5074e4 100644 --- a/ext/standard/tests/array/rsort_variation2.phpt +++ b/ext/standard/tests/array/rsort_variation2.phpt @@ -5,7 +5,7 @@ Test rsort() function : usage variations - Pass different data types as $sort_fl --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*18*/ "SORT_NUMERIC", 'SORT_NUMERIC', $heredoc, - + // object data /*21*/ new classA(), @@ -91,14 +91,14 @@ $inputs = array( $iterator = 1; foreach($inputs as $input) { echo "\n-- Iteration $iterator --\n"; - + //create temporary array in case rsort() works $temp = $array_arg; - + var_dump( rsort($temp, $input) ); var_dump($temp); $iterator++; - + $temp = null; }; @@ -337,7 +337,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]=> @@ -354,7 +354,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]=> @@ -371,7 +371,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]=> @@ -388,7 +388,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]=> @@ -405,7 +405,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]=> @@ -422,7 +422,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]=> @@ -469,7 +469,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 2edad3eaec..6f92407587 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -42,25 +42,25 @@ $count = 1; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; - $temp_array = $array; + echo "- With Defualt sort flag -\n"; + $temp_array = $array; var_dump(rsort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} 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..08ce8a66d5 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -3,12 +3,12 @@ Test rsort() function : usage variations - referenced variables --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ /* - * Test behaviour of rsort() when: + * Test behaviour of rsort() when: * 1. passed an array of referenced variables * 2. $array_arg is a reference to another array * 3. $array_arg is passed by reference @@ -20,7 +20,7 @@ $value1 = 100; $value2 = 33; $value3 = 555; -// an array containing integer references +// an array containing integer references $unsorted_numerics = array( &$value1 , &$value2, &$value3); echo "\n-- 'flag' value is defualt --\n"; @@ -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 4cc1c52622..62e9f10aef 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -41,7 +41,7 @@ foreach ($various_arrays as $array) { // loop through $flags array and setting all possible flag values foreach($flags as $key => $flag){ echo "- Sort flag = $key -\n"; - + $temp_array = $array; var_dump(rsort($temp_array, $flag) ); var_dump($temp_array); @@ -52,7 +52,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 59b43a8fcb..d593573adb 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - Hexadecimal vales --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -13,7 +13,7 @@ Test rsort() function : usage variations - Hexadecimal vales echo "*** Testing rsort() : variation ***\n"; -// an array contains unsorted hexadecimal values +// an array contains unsorted hexadecimal values $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa); echo "\n-- 'flag' value is defualt --\n"; @@ -34,7 +34,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 2c04a143f1..14eab635d0 100644 --- a/ext/standard/tests/array/rsort_variation7.phpt +++ b/ext/standard/tests/array/rsort_variation7.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - boolean values --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -39,7 +39,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 3b5e9b686f..28bfe2c5a5 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - multi-dimensional arrays --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -33,14 +33,14 @@ $count = 1; // loop through to test rsort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; - + + echo "\n-- Iteration $count --\n"; + echo "\n-- 'flag' value is default --\n"; $temp_array = $array; var_dump(rsort($temp_array) ); var_dump($temp_array); - + echo "\n-- 'flag' value is SORT_REGULAR --\n"; $temp_array = $array; var_dump(rsort($temp_array, SORT_REGULAR) ); @@ -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_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt index 53fc8d4c0b..9d0d917b88 100644 --- a/ext/standard/tests/array/rsort_variation9.phpt +++ b/ext/standard/tests/array/rsort_variation9.phpt @@ -3,7 +3,7 @@ Test rsort() function : usage variations - mixed associative arrays --FILE-- <?php /* Prototype : bool rsort(array &$array_arg [, int $sort_flags]) - * Description: Sort an array in reverse order + * Description: Sort an array in reverse order * Source code: ext/standard/array.c */ @@ -35,8 +35,8 @@ $various_arrays = array( $count = 1; -// loop through to test rsort() with different arrays, -// to test the new keys for the elements in the sorted array +// loop through to test rsort() with different arrays, +// to test the new keys for the elements in the sorted array foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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_basic1.phpt b/ext/standard/tests/array/shuffle_basic1.phpt index e29dec9220..d601f5433c 100644 --- a/ext/standard/tests/array/shuffle_basic1.phpt +++ b/ext/standard/tests/array/shuffle_basic1.phpt @@ -3,7 +3,7 @@ Test shuffle() function : basic functionality - array with default keys --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/shuffle_basic2.phpt index 8977e349f9..cb127d23ef 100644 --- a/ext/standard/tests/array/shuffle_basic2.phpt +++ b/ext/standard/tests/array/shuffle_basic2.phpt @@ -3,12 +3,12 @@ Test shuffle() function : basic functionality - with associative array --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ /* -* Test behaviour of shuffle when an associative array is +* Test behaviour of shuffle when an associative array is * passed to the 'array_arg' argument and check for the * changes in the input array by printing the input array * before and after shuffle() function is applied on it diff --git a/ext/standard/tests/array/shuffle_error.phpt b/ext/standard/tests/array/shuffle_error.phpt index 27bf260949..833b390363 100644 --- a/ext/standard/tests/array/shuffle_error.phpt +++ b/ext/standard/tests/array/shuffle_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test shuffle() function : error conditions +Test shuffle() function : error conditions --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ /* Test shuffle() to see that warning messages are emitted - * when invalid number of arguments are passed to the function + * when invalid number of arguments are passed to the function */ echo "*** Testing shuffle() : error conditions ***\n"; @@ -23,7 +23,7 @@ $array_arg = array(1, "two" => 2); $extra_arg = 10; var_dump( shuffle($array_arg, $extra_arg) ); -// printing the input array to check that it is not affected +// printing the input array to check that it is not affected // by above shuffle() function calls echo "\n-- original input array --\n"; var_dump( $array_arg ); diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt index 9712d76113..2f578be11b 100644 --- a/ext/standard/tests/array/shuffle_variation1.phpt +++ b/ext/standard/tests/array/shuffle_variation1.phpt @@ -3,7 +3,7 @@ Test shuffle() function : usage variations - unexpected values for 'array_arg' --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ @@ -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/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt index b0394338ea..a0cb6b632e 100644 --- a/ext/standard/tests/array/shuffle_variation2.phpt +++ b/ext/standard/tests/array/shuffle_variation2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test shuffle() function : usage variation - with MultiDimensional array +Test shuffle() function : usage variation - with MultiDimensional array --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ @@ -26,7 +26,7 @@ $array_arg = array( ); -// calling shuffle() function with multi-dimensional array +// calling shuffle() function with multi-dimensional array var_dump( shuffle($array_arg) ); echo "\nThe output array is:\n"; var_dump( $array_arg ); @@ -37,9 +37,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; for($i=0; $i<=6; $i++) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($array_arg[$i]) ); + var_dump( shuffle($array_arg[$i]) ); echo "\nThe output array is:\n"; - var_dump( $array_arg[$i] ); + var_dump( $array_arg[$i] ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt index 68dad4a471..1cb4e4d1eb 100644 --- a/ext/standard/tests/array/shuffle_variation3.phpt +++ b/ext/standard/tests/array/shuffle_variation3.phpt @@ -3,7 +3,7 @@ Test shuffle() function : usage variation - arrays with diff types of values --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ @@ -53,9 +53,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; foreach($array_arg as $arr) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($arr) ); + var_dump( shuffle($arr) ); echo "\nThe output array is:\n"; - var_dump( $arr ); + var_dump( $arr ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt index 2b5f80b71e..399197c19b 100644 --- a/ext/standard/tests/array/shuffle_variation4.phpt +++ b/ext/standard/tests/array/shuffle_variation4.phpt @@ -3,12 +3,12 @@ Test shuffle() function : usage variation - associative arrays with diff types o --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ /* -* Test behaviour of shuffle() function when associative arrays +* Test behaviour of shuffle() function when associative arrays * having different types of values, are passed to 'array_arg' argument */ @@ -56,9 +56,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n $counter = 1; foreach($array_arg as $arr) { echo "\n-- Iteration $counter --\n"; - var_dump( shuffle($arr) ); + var_dump( shuffle($arr) ); echo "\nThe output array is:\n"; - var_dump( $arr ); + var_dump( $arr ); $counter++; } diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt index e7a7db1be5..ca2c1ac90e 100644 --- a/ext/standard/tests/array/shuffle_variation5.phpt +++ b/ext/standard/tests/array/shuffle_variation5.phpt @@ -3,12 +3,12 @@ Test shuffle() function : usage variation - arrays with diff heredoc strings --FILE-- <?php /* Prototype : bool shuffle(array $array_arg) - * Description: Randomly shuffle the contents of an array + * Description: Randomly shuffle the contents of an array * Source code: ext/standard/array.c */ /* -* Test behaviour of shuffle() when an array of heredoc strings is passed to +* Test behaviour of shuffle() when an array of heredoc strings is passed to * 'array_arg' argument of the function */ @@ -64,15 +64,15 @@ $heredoc_asso_array = array( // test shuffle() with array containing heredoc strings as values echo "\n-- with array of heredoc strings --\n"; -var_dump( shuffle($heredoc_array) ); +var_dump( shuffle($heredoc_array) ); echo "\nThe output array is:\n"; -var_dump( $heredoc_array ); +var_dump( $heredoc_array ); -// test shuffle() with array containing heredoc strings as its keys +// test shuffle() with array containing heredoc strings as its keys echo "\n-- with array having heredoc strings as keys --\n"; -var_dump( shuffle($heredoc_asso_array) ); +var_dump( shuffle($heredoc_asso_array) ); echo "\nThe output array is:\n"; -var_dump( $heredoc_asso_array ); +var_dump( $heredoc_asso_array ); echo "Done"; ?> diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt index c292199cb9..ac86cbf8d7 100644 --- a/ext/standard/tests/array/sizeof_basic1.phpt +++ b/ext/standard/tests/array/sizeof_basic1.phpt @@ -1,17 +1,17 @@ --TEST-- -Test sizeof() function : basic functionality - for scalar types +Test sizeof() function : basic functionality - for scalar types --FILE-- <?php /* Prototype : int sizeof(mixed $var[, int $mode] ) - * Description: Counts an elements in an array. If Standard PHP library is + * Description: Counts an elements in an array. If Standard PHP library is * installed, it will return the properties of an object. * Source code: ext/standard/basic_functions.c * Alias to functions: count() */ -/* Testing the sizeof() for some of the scalar types(integer, float) values +/* Testing the sizeof() for some of the scalar types(integer, float) values * in default, COUNT_NORMAL and COUNT_RECURSIVE modes. - */ + */ echo "*** Testing sizeof() : basic functionality ***\n"; diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index 3dfbc7c662..bbcbe11091 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -3,17 +3,17 @@ Test sizeof() function : basic functionality - for non-scalar type(array) --FILE-- <?php /* Prototype : int sizeof(mixed $var[, int $mode] ) - * Description: Counts an elements in an array. If Standard PHP library is + * Description: Counts an elements in an array. If Standard PHP library is * installed, it will return the properties of an object. * Source code: ext/standard/basic_functions.c * Alias to functions: count() */ -/* Testing the sizeof() for non-scalar type(array) value +/* Testing the sizeof() for non-scalar type(array) value * in default, COUNT_NORMAL and COUNT_RECURSIVE modes. * Sizeof() has been tested for simple integer, string, * indexed and mixed arrays. - */ + */ echo "*** Testing sizeof() : basic functionality ***\n"; @@ -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_error.phpt b/ext/standard/tests/array/sizeof_error.phpt index 3a9ce1b629..c6274830cf 100644 --- a/ext/standard/tests/array/sizeof_error.phpt +++ b/ext/standard/tests/array/sizeof_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sizeof() function : error conditions +Test sizeof() function : error conditions --FILE-- <?php /* Prototype : int sizeof(mixed $var[, int $mode] ) - * Description: Counts an elements in an array. If Standard PHP Library is installed, + * Description: Counts an elements in an array. If Standard PHP Library is installed, * it will return the properties of an object. * Source code: ext/standard/basic_functions.c * Alias to functions: count() 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_object2.phpt b/ext/standard/tests/array/sizeof_object2.phpt index c81018f635..404443ae59 100644 --- a/ext/standard/tests/array/sizeof_object2.phpt +++ b/ext/standard/tests/array/sizeof_object2.phpt @@ -15,11 +15,11 @@ echo "--- Testing sizeof() with objects which doesn't implement Countable interf // class without member class test -{ +{ // no members } -// class with only members and with out member functions +// class with only members and with out member functions class test1 { public $member1; @@ -33,7 +33,7 @@ class test1 // class with only member functions class test2 { - // no data members + // no data members public function display() { @@ -53,7 +53,7 @@ abstract class abstract_class { public $member1; private $member2; - + abstract protected function display(); } @@ -83,7 +83,7 @@ for($i = 0; $i < count($objects); $i++) echo "Default Mode: "; var_dump( sizeof($var) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($var, COUNT_NORMAL) ); echo "\n"; @@ -91,7 +91,7 @@ for($i = 0; $i < count($objects); $i++) echo "COUNT_RECURSIVE Mode: "; var_dump( sizeof($var, COUNT_RECURSIVE) ); echo "\n"; - + $counter++; } diff --git a/ext/standard/tests/array/sizeof_variation1.phpt b/ext/standard/tests/array/sizeof_variation1.phpt index e98c334267..5917a798e1 100644 --- a/ext/standard/tests/array/sizeof_variation1.phpt +++ b/ext/standard/tests/array/sizeof_variation1.phpt @@ -15,7 +15,7 @@ echo "--- Testing sizeof() for all scalar types in default,COUNT_NORMAL and COUN // get a resource variable $fp = fopen(__FILE__, "r"); -// array containing all scalar types +// array containing all scalar types $values = array ( // int values /* 1 */ 0, @@ -27,27 +27,27 @@ $values = array ( 12.3456789000e10, 12.3456789000E-10, /* 7 */ .5, - + // NULL values /* 8 */ NULL, null, - // boolean values + // boolean values /* 10 */ TRUE, FALSE, true, /* 13 */ false, - // string data + // string data /* 14 */ "", - '', + '', "string", /* 17 */ 'string', - // undefined variable + // undefined variable @$undefined_var, - // resource variable + // resource variable /* 19 */ $fp ); @@ -56,8 +56,8 @@ $counter = 1; for($i = 0; $i < count($values); $i++) { echo "-- Iteration $counter --\n"; - - $var = $values[$i]; + + $var = $values[$i]; echo "Default Mode: "; var_dump( sizeof($var) ); diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index ba31157ff1..8bd74a0207 100644 --- a/ext/standard/tests/array/sizeof_variation2.phpt +++ b/ext/standard/tests/array/sizeof_variation2.phpt @@ -3,7 +3,7 @@ Test sizeof() function : usage variations - different array values for 'var' arg --FILE-- <?php /* Prototype : int sizeof($mixed var[, int $mode]) - * Description: Counts an elements in an array. If Standard PHP library is installed, + * Description: Counts an elements in an array. If Standard PHP library is installed, * it will return the properties of an object. * Source code: ext/standard/basic_functions.c * Alias to functions: count() @@ -16,7 +16,7 @@ $fp = fopen(__FILE__, "r"); echo "--- Testing sizeof() with different array values for 'var' argument ---\n"; -// array containing different types of array values for 'var' argument +// array containing different types of array values for 'var' argument $values = array ( /* 1 */ array($fp, "resource" => $fp), array(1, array(3, 4, array(6, array(8)))), @@ -32,9 +32,9 @@ $values = array ( array(false => 'red', true => 'pen' ), array('color' => "red", "item" => 'pen', 1 => "Hi", "" => "Hello" ), /* 14 */ array($fp, "resource1" => $fp, 'resource2' => $fp, array( $fp, 'type' => $fp) ) -); +); -// loop through each element of the values array for 'var' argument +// loop through each element of the values array for 'var' argument // check the working of sizeof() $counter = 1; for($i = 0; $i < count($values); $i++) @@ -42,10 +42,10 @@ for($i = 0; $i < count($values); $i++) echo "-- Iteration $counter --\n"; $var = $values[$i]; - echo "Default Mode: "; + echo "Default Mode: "; var_dump( sizeof($var) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($var, COUNT_NORMAL) ); echo "\n"; @@ -56,10 +56,10 @@ for($i = 0; $i < count($values); $i++) $counter++; } - + 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..b78b620d7d 100644 --- a/ext/standard/tests/array/sizeof_variation3.phpt +++ b/ext/standard/tests/array/sizeof_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode +Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode --FILE-- <?php /* Prototype : int sizeof($mixed var[, int $mode]) @@ -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_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 465b818174..63fc05bd46 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sizeof() function : usage variations - all kinds of unset variables for 'var' argument +Test sizeof() function : usage variations - all kinds of unset variables for 'var' argument --FILE-- <?php /* Prototype : int sizeof($mixed var[, int $mode]) @@ -15,11 +15,11 @@ echo "--- Testing sizeof() for all kinds of unset variables in default, Normal a // class declaration class test -{ +{ public $member1; } -// get an resource variable +// get an resource variable $fp = fopen(__FILE__, "r"); // array containing different types of variables @@ -54,21 +54,21 @@ $values = array ( /* 20 */ $fp ); -// loop through the each element of the $values array for 'var' argument +// loop through the each element of the $values array for 'var' argument // and check the functionality of sizeof() $counter = 1; foreach($values as $value) { echo "-- Iteration $counter --\n"; - - // unset the variable + + // unset the variable unset($value); // now check the size of unset variable when different modes are given echo "Default Mode: "; var_dump( sizeof($value) ); echo "\n"; - + echo "COUNT_NORMAL Mode: "; var_dump( sizeof($value, COUNT_NORMAL) ); echo "\n"; diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt index 1c487045c6..d608dbbe1b 100644 --- a/ext/standard/tests/array/sizeof_variation5.phpt +++ b/ext/standard/tests/array/sizeof_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sizeof() function : usage variations - different values for 'mode' argument +Test sizeof() function : usage variations - different values for 'mode' argument --FILE-- <?php /* Prototype : int sizeof($mixed var[, int $mode]) @@ -52,15 +52,15 @@ $mode_values = array ( new test(), /* 22 */ $fp ); - -// loop through the each element of $modes_array for 'mode' argument + +// loop through the each element of $modes_array for 'mode' argument // and check the working of sizeof() $counter = 1; for($i = 0; $i < count($mode_values); $i++) { echo "-- Iteration $counter --\n"; $mode = $mode_values[$i]; - + var_dump( sizeof($array1, $mode) ); $counter++; @@ -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 5c6c412bee..df37b2d1d5 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test sort() function : basic functionality +Test sort() function : basic functionality --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ /* - * Testing sort() by providing arrays with default keys and assoc arrays + * Testing sort() by providing arrays with default keys and assoc arrays * to check the basic functionality with following flag values. * flag value as defualt * SORT_REGULAR - compare items normally @@ -19,13 +19,13 @@ Test sort() function : basic functionality echo "*** Testing sort() : basic functionality ***\n"; -// associative array containing unsorted string values +// associative array containing unsorted string values $unsorted_strings = array( "l" => "lemon", "o" => "orange", "O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20", "b" => "banana", ); - + // array with default keys containing unsorted numeric values $unsorted_numerics = array( 100, 33, 555, 22 ); @@ -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_error.phpt b/ext/standard/tests/array/sort_error.phpt index 7c7ecb1105..4864ef33df 100644 --- a/ext/standard/tests/array/sort_error.phpt +++ b/ext/standard/tests/array/sort_error.phpt @@ -1,14 +1,14 @@ --TEST-- -Test sort() function : error conditions +Test sort() function : error conditions --FILE-- <?php /* Prototype : bool sort(array &array_arg [, int sort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ /* -* Testing sort() function with all possible error conditions +* Testing sort() function with all possible error conditions */ echo "*** Testing sort() : error conditions ***\n"; @@ -27,7 +27,7 @@ $extra_arg = 10; foreach($flag_value as $key => $flag){ echo "\nSort flag = $key\n"; var_dump( sort($array_arg,$flag, $extra_arg) ); - + // dump the input array to ensure that it wasn't changed var_dump($array_arg); } diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt index a55a0962a8..caa9c8dbb6 100644 --- a/ext/standard/tests/array/sort_object1.phpt +++ b/ext/standard/tests/array/sort_object1.phpt @@ -3,7 +3,7 @@ Test sort() function : object functionality - sorting objects, 'sort_flags' as d --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -41,14 +41,14 @@ class for_string_sort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_sort(11), new for_integer_sort(66), new for_integer_sort(23), new for_integer_sort(-5), new for_integer_sort(0.001), new for_integer_sort(0) ); // array of string objects -$unsorted_str_obj = array ( +$unsorted_str_obj = array ( new for_string_sort("axx"), new for_string_sort("t"), new for_string_sort("w"), new for_string_sort("py"), new for_string_sort("apple"), new for_string_sort("Orange"), diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt index 7e13cf8abf..93b0fa2e8b 100644 --- a/ext/standard/tests/array/sort_object2.phpt +++ b/ext/standard/tests/array/sort_object2.phpt @@ -3,7 +3,7 @@ Test sort() function : object functionality - sorting objects with diff. accessi --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -19,13 +19,13 @@ class for_integer_sort { public $public_class_value; private $private_class_value; - protected $protected_class_value; + protected $protected_class_value; // initializing object member value function __construct($value1, $value2,$value3){ $this->public_class_value = $value1; $this->private_class_value = $value2; - $this->protected_class_value = $value3; + $this->protected_class_value = $value3; } } @@ -50,7 +50,7 @@ class for_string_sort } // array of integer objects -$unsorted_int_obj = array( +$unsorted_int_obj = array( new for_integer_sort(11,33,30), new for_integer_sort(66,44,4), new for_integer_sort(-88,-5,5), @@ -58,8 +58,8 @@ $unsorted_int_obj = array( ); // array of string objects -$unsorted_str_obj = array ( - new for_string_sort("axx","AXX","ass"), +$unsorted_str_obj = array ( + new for_string_sort("axx","AXX","ass"), new for_string_sort("t","eee","abb"), new for_string_sort("w","W", "c"), new for_string_sort("py","PY", "pt"), diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index f3eba1265d..f778b81907 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - unexpected values for 'array_arg' argu --FILE-- <?php /* Prototype : bool sort(array &array_arg [, int $sort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ @@ -73,9 +73,9 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of sort() -// when $array argument is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n"; -echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; +echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; $counter = 1; for($index = 0; $index < count($unexpected_values); $index ++) { @@ -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 -- diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt index 2461915869..9f76968a03 100644 --- a/ext/standard/tests/array/sort_variation10.phpt +++ b/ext/standard/tests/array/sort_variation10.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort octal values --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -12,7 +12,7 @@ Test sort() function : usage variations - sort octal values * testing sort() by providing different octal array for $array argument * with following flag values * 1.flag value as defualt - * 2.SORT_REGULAR - compare items normally + * 2.SORT_REGULAR - compare items normally * 3.SORT_NUMERIC - compare items numerically */ @@ -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..4faec0196b 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..3ee1784edc 100644 --- a/ext/standard/tests/array/sort_variation2.phpt +++ b/ext/standard/tests/array/sort_variation2.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - unexpected values for 'sort_flags' arg --FILE-- <?php /* Prototype : bool sort(array &array_arg [, int $sort_flags]) - * Description: Sort an array + * Description: Sort an array * Source code: ext/standard/array.c */ @@ -79,8 +79,8 @@ for($index = 0; $index < count($unexpected_values); $index ++) { // sort the array, retain a temp. copy of input array for next iteration $value = $unexpected_values [$index]; $temp_array = $unsorted_values; - var_dump( sort($temp_array, $value) ); - + var_dump( sort($temp_array, $value) ); + //dump the sorted array var_dump($temp_array); $counter++; @@ -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]=> @@ -274,7 +274,7 @@ array(3) { } -- Iteration 18 -- -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]=> @@ -286,7 +286,7 @@ array(3) { } -- Iteration 19 -- -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]=> @@ -298,7 +298,7 @@ array(3) { } -- 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_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt index 3aec6dcdb1..1ad058d4e9 100644 --- a/ext/standard/tests/array/sort_variation3.phpt +++ b/ext/standard/tests/array/sort_variation3.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort integer/float values --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -29,7 +29,7 @@ $various_arrays = array ( // mixed value array array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33), - + // array values contains minimum and maximum ranges array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649) ); @@ -44,20 +44,20 @@ echo "\n-- Testing sort() by supplying various integer/float arrays --\n"; foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; - echo "- With Defualt sort flag -\n"; - $temp_array = $array; + echo "- With Defualt sort flag -\n"; + $temp_array = $array; var_dump(sort($temp_array) ); var_dump($temp_array); // loop through $flag_value array and setting all possible flag values foreach($flag_value as $key => $flag){ echo "- Sort flag = $key -\n"; - $temp_array = $array; + $temp_array = $array; var_dump(sort($temp_array, $flag) ); var_dump($temp_array); - } + } $count++; -} +} echo "Done\n"; ?> diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt index cdc067a0e8..f4f6d783c1 100644 --- a/ext/standard/tests/array/sort_variation4.phpt +++ b/ext/standard/tests/array/sort_variation4.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort reference values --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -21,7 +21,7 @@ $value1 = 100; $value2 = 33; $value3 = 555; -// an array containing integer references +// an array containing integer references $unsorted_numerics = array( &$value1 , &$value2, &$value3); echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is defualt --\n"; @@ -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..0395d0c97f 100644 --- a/ext/standard/tests/array/sort_variation5.phpt +++ b/ext/standard/tests/array/sort_variation5.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -23,10 +23,10 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { echo "*** Testing sort() : usage variations ***\n"; $various_arrays = array ( - // group of escape sequences + // group of escape sequences array(null, NULL, "\a", "\cx", "\e", "\f", "\n", "\r", "\t", "\xhh", "\ddd", "\v"), - // array contains combination of capital/small letters + // array contains combination of capital/small letters array("lemoN", "Orange", "banana", "apple", "Test", "TTTT", "ttt", "ww", "x", "X", "oraNGe", "BANANA") ); @@ -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..cf094e864b 100644 --- a/ext/standard/tests/array/sort_variation6.phpt +++ b/ext/standard/tests/array/sort_variation6.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort hexadecimal values --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -17,7 +17,7 @@ Test sort() function : usage variations - sort hexadecimal values echo "*** Testing sort() : usage variations ***\n"; -// an array contains unsorted hexadecimal values +// an array contains unsorted hexadecimal values $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa); echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt --\n"; @@ -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..f61ee46e54 100644 --- a/ext/standard/tests/array/sort_variation7.phpt +++ b/ext/standard/tests/array/sort_variation7.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort boolean values --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -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..17228f28ac 100644 --- a/ext/standard/tests/array/sort_variation8.phpt +++ b/ext/standard/tests/array/sort_variation8.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR +Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -37,8 +37,8 @@ echo "\n-- Testing sort() by supplying various arrays containing sub arrays --\n // loop through to test sort() with different arrays foreach ($various_arrays as $array) { - - echo "\n-- Iteration $count --\n"; + + echo "\n-- Iteration $count --\n"; // testing sort() function by supplying different arrays, flag value is defualt echo "- With Defualt sort flag -\n"; $temp_array = $array; @@ -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..53e5679600 100644 --- a/ext/standard/tests/array/sort_variation9.phpt +++ b/ext/standard/tests/array/sort_variation9.phpt @@ -3,7 +3,7 @@ Test sort() function : usage variations - sort diff. associative arrays, 'sort_f --FILE-- <?php /* Prototype : bool sort ( array &$array [, int $sort_flags] ) - * Description: This function sorts an array. + * Description: This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. * Source code: ext/standard/array.c */ @@ -33,8 +33,8 @@ $various_arrays = array( $count = 1; echo "\n-- Testing sort() by supplying various arrays with key values --\n"; -// loop through to test sort() with different arrays, -// to test the new keys for the elements in the sorted array +// loop through to test sort() with different arrays, +// to test the new keys for the elements in the sorted array foreach ($various_arrays as $array) { echo "\n-- Iteration $count --\n"; @@ -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..c0dfefd836 100644 --- a/ext/standard/tests/array/uasort_basic1.phpt +++ b/ext/standard/tests/array/uasort_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : basic functionality +Test uasort() function : basic functionality --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -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..de0275c15a 100644 --- a/ext/standard/tests/array/uasort_basic2.phpt +++ b/ext/standard/tests/array/uasort_basic2.phpt @@ -3,7 +3,7 @@ Test uasort() function : basic functionality - duplicate values --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -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_error.phpt b/ext/standard/tests/array/uasort_error.phpt index a517e4a511..cc2dd3a217 100644 --- a/ext/standard/tests/array/uasort_error.phpt +++ b/ext/standard/tests/array/uasort_error.phpt @@ -1,15 +1,15 @@ --TEST-- -Test uasort() function : error conditions +Test uasort() function : error conditions --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ echo "*** Testing uasort() : error conditions ***\n"; -// comparison function +// comparison function /* Prototype : int cmp(mixed $value1, mixed $value2) * Parameters : $value1 and $value2 - values to be compared * Return value : 0 - if both values are same @@ -30,7 +30,7 @@ function cmp($value1, $value2) } } -// Initialize 'array_arg' +// Initialize 'array_arg' $array_arg = array(0 => 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25); // With zero arguments diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index b728a1ffdd..020b0d3c0b 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : object functionality +Test uasort() function : object functionality --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -49,7 +49,7 @@ function multiple_cmp($value1, $value2) class SimpleClass1 { private $int_value; - + public function __construct($value) { $this->int_value = $value; } @@ -68,7 +68,7 @@ class SimpleClass2 } public function getValue() { return $this->int_value; - } + } } // array of SimpleClass objects with only one member @@ -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_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt index 26fa6f11b4..b6862b7588 100644 --- a/ext/standard/tests/array/uasort_object2.phpt +++ b/ext/standard/tests/array/uasort_object2.phpt @@ -1,18 +1,18 @@ --TEST-- -Test uasort() function : object functionality - sort diff. objects +Test uasort() function : object functionality - sort diff. objects --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c * /* * This testcase tests uasort() functionality with different objects - * Objects of different classes: + * Objects of different classes: * simple class, * child class, - * empty class & + * empty class & * static class */ @@ -43,11 +43,11 @@ function cmp_function($value1, $value2) class SimpleClass { private $int_value; - + public function __construct($value) { $this->int_value = $value; } - + } // Class without any member diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt index aae2f33167..c8475f9112 100644 --- a/ext/standard/tests/array/uasort_variation1.phpt +++ b/ext/standard/tests/array/uasort_variation1.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - unexpected values for 'array_arg' ar --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -60,7 +60,7 @@ $input_values = array( // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, @@ -80,7 +80,7 @@ $input_values = array( // undefined data @$undefined_var, - + // unset data /*22*/ @$unset_var, ); @@ -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..15b62930c3 100644 --- a/ext/standard/tests/array/uasort_variation10.phpt +++ b/ext/standard/tests/array/uasort_variation10.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - sort array with reference variables --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -35,7 +35,7 @@ function cmp_function($value1, $value2) echo "*** Testing uasort() : 'array_arg' with elements as reference ***\n"; // different variables which are used as elements of 'array_arg' -$value1 = -5; +$value1 = -5; $value2 = 100; $value3 = 0; $value4 = &$value1; @@ -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..c0afb8df5f 100644 --- a/ext/standard/tests/array/uasort_variation11.phpt +++ b/ext/standard/tests/array/uasort_variation11.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - different associative arrays --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -19,7 +19,7 @@ echo "*** Testing uasort() : sorting different associative arrays ***\n"; * Return value : 0 - if both values are same * 1 - if value1 is greater than value2 * -1 - if value1 is less than value2 - * Description : compares value1 and value2 + * Description : compares value1 and value2 */ function cmp($value1, $value2) { @@ -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_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt index e5278fbab7..6283245410 100644 --- a/ext/standard/tests/array/uasort_variation2.phpt +++ b/ext/standard/tests/array/uasort_variation2.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - unexpected values for 'cmp_function' --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt Binary files differindex 47023e44bf..8fe5f27821 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..613edd4684 100644 --- a/ext/standard/tests/array/uasort_variation4.phpt +++ b/ext/standard/tests/array/uasort_variation4.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - sort different numeric values --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -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_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt index b398d62709..e6996a55fe 100644 --- a/ext/standard/tests/array/uasort_variation5.phpt +++ b/ext/standard/tests/array/uasort_variation5.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : usage variations - sort diff. strings +Test uasort() function : usage variations - sort diff. strings --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -33,7 +33,7 @@ function cmp_function($value1, $value2) } } -// Different heredoc strings to be sorted +// Different heredoc strings to be sorted $empty_heredoc =<<<EOT EOT; @@ -64,7 +64,7 @@ var_dump($single_quoted_values); // Double quoted strings $double_quoted_values = array( - 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); echo "-- Sorting Double Quoted String values --\n"; diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt index bcc7138270..46d5e24aa4 100644 --- a/ext/standard/tests/array/uasort_variation6.phpt +++ b/ext/standard/tests/array/uasort_variation6.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : usage variations - sort array having subarrays +Test uasort() function : usage variations - sort array having subarrays --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -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..48028dbcd8 100644 --- a/ext/standard/tests/array/uasort_variation7.phpt +++ b/ext/standard/tests/array/uasort_variation7.phpt @@ -3,7 +3,7 @@ Test uasort() function : usage variations - anonymous function as 'cmp_function' --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -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_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt index 2bb2b46512..dd0a7a3913 100644 --- a/ext/standard/tests/array/uasort_variation8.phpt +++ b/ext/standard/tests/array/uasort_variation8.phpt @@ -3,14 +3,14 @@ Test uasort() function : usage variations - built-in function as 'cmp_function' --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ /* * Passing different built-in library functions in place of 'cmp_function' * valid comparison functions: strcmp() & strcasecmp() -* language constructs: echo & exit +* language constructs: echo & exit */ echo "*** Testing uasort() : built in function as 'cmp_function' ***\n"; @@ -19,7 +19,7 @@ $array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", "p" => "Pine $builtin_fun_arg = $array_arg; $languageConstruct_fun_arg = $array_arg; -// Testing library functions as comparison function +// Testing library functions as comparison function echo "-- Testing uasort() with built-in 'cmp_function': strcasecmp() --\n"; var_dump( uasort($builtin_fun_arg, 'strcasecmp') ); // expecting: bool(true) var_dump($builtin_fun_arg); diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 53f32b848d..b8c5598d84 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -1,9 +1,9 @@ --TEST-- -Test uasort() function : usage variations - 'cmp_function' with reference argument +Test uasort() function : usage variations - 'cmp_function' with reference argument --FILE-- <?php /* Prototype : bool uasort(array $array_arg, string $cmp_function) - * Description: Sort an array with a user-defined comparison function and maintain index association + * Description: Sort an array with a user-defined comparison function and maintain index association * Source code: ext/standard/array.c */ @@ -14,7 +14,7 @@ echo "*** Testing uasort() : 'cmp_function' with reference arguments ***\n"; // comparison function /* Prototype : int cmp(mixed &$value1, mixed &$value2) - * Parameters : $value1 and $value2 - values received by reference + * Parameters : $value1 and $value2 - values received by reference * Return value : 0 - if both values are same * 1 - if value1 is greater than value2 * -1 - if value1 is less than value2 @@ -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_error.phpt b/ext/standard/tests/array/uksort_error.phpt index db9fdea088..241ed2f828 100644 --- a/ext/standard/tests/array/uksort_error.phpt +++ b/ext/standard/tests/array/uksort_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test uksort() function : error conditions +Test uksort() function : error conditions --FILE-- <?php /* Prototype : bool uksort(array array_arg, string cmp_function) - * Description: Sort an array by keys using a user-defined comparison function + * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : error conditions ***\n"; diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt index 75bef3fdcc..b2214a5880 100644 --- a/ext/standard/tests/array/uksort_variation1.phpt +++ b/ext/standard/tests/array/uksort_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test uksort() function : usage variation +Test uksort() function : usage variation --FILE-- <?php /* Prototype : bool uksort(array array_arg, string cmp_function) - * Description: Sort an array by keys using a user-defined comparison function + * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : usage variation ***\n"; @@ -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/uksort_variation2.phpt b/ext/standard/tests/array/uksort_variation2.phpt index 5ac32f02b8..2f5b8b5d89 100644 --- a/ext/standard/tests/array/uksort_variation2.phpt +++ b/ext/standard/tests/array/uksort_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test uksort() function : usage variation +Test uksort() function : usage variation --FILE-- <?php /* Prototype : bool uksort(array array_arg, string cmp_function) - * Description: Sort an array by keys using a user-defined comparison function + * Description: Sort an array by keys using a user-defined comparison function * Source code: ext/standard/array.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing uksort() : usage variation ***\n"; diff --git a/ext/standard/tests/array/unexpected_array_mod_bug.phpt b/ext/standard/tests/array/unexpected_array_mod_bug.phpt index 08774c09a4..2762ebd830 100644 --- a/ext/standard/tests/array/unexpected_array_mod_bug.phpt +++ b/ext/standard/tests/array/unexpected_array_mod_bug.phpt @@ -3,7 +3,7 @@ Crash when function parameter modified via reference --FILE-- <?php function usercompare($a,$b) { - unset($GLOBALS['my_var'][2]); + unset($GLOBALS['my_var'][2]); return $a <=> $b; } $my_var = array(1 => "entry_1", diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index c25f2a7525..64351f707c 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test usort() function : basic functionality +Test usort() function : basic functionality --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -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_error1.phpt b/ext/standard/tests/array/usort_error1.phpt index 222b9c62a6..70c555e346 100644 --- a/ext/standard/tests/array/usort_error1.phpt +++ b/ext/standard/tests/array/usort_error1.phpt @@ -3,7 +3,7 @@ Test usort() function : error conditions - Pass incorrect number of arguments --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt index d0ccd36221..7bf0f659e0 100644 --- a/ext/standard/tests/array/usort_error2.phpt +++ b/ext/standard/tests/array/usort_error2.phpt @@ -3,7 +3,7 @@ Test usort() function : error conditions - Pass unknown 'cmp_function' --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -28,7 +28,7 @@ function cmp($value1, $value2) } } -// Initialize 'array_arg' +// Initialize 'array_arg' $array_arg = array(0 => 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25); $extra_arg = 10; diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/usort_object1.phpt index 8fccc49047..0e87443d1c 100644 --- a/ext/standard/tests/array/usort_object1.phpt +++ b/ext/standard/tests/array/usort_object1.phpt @@ -3,7 +3,7 @@ Test usort() function : object functionality - different number of properties --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/usort_object2.phpt index 3226741da4..00d302f35b 100644 --- a/ext/standard/tests/array/usort_object2.phpt +++ b/ext/standard/tests/array/usort_object2.phpt @@ -3,12 +3,12 @@ Test usort() function : object functionality - Different types of classes --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ /* - * Pass an array of objects which are either: + * Pass an array of objects which are either: * 1. Empty * 2. Static * 2. Inherited diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt index f2aeb54a6b..761efbca39 100644 --- a/ext/standard/tests/array/usort_variation1.phpt +++ b/ext/standard/tests/array/usort_variation1.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - Pass different data types as $array_a --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..0aeed40292 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - duplicate keys and values --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -26,8 +26,8 @@ function cmp($value1, $value2) } // Array with duplicate string and integer keys and values -$array_arg = array(0 => 2, "a" => 8, "d" => 9, - 3 => 3, 5 => 2, "o" => 6, +$array_arg = array(0 => 2, "a" => 8, "d" => 9, + 3 => 3, 5 => 2, "o" => 6, "z" => -99, 0 => 1, "z" => 3); echo "\n-- Array with duplicate keys --\n"; @@ -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_variation2.phpt b/ext/standard/tests/array/usort_variation2.phpt index fa5d463ade..70d21649ce 100644 --- a/ext/standard/tests/array/usort_variation2.phpt +++ b/ext/standard/tests/array/usort_variation2.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - Pass different data types as $cmp_fun --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index d01a2fcc0e..5d21776060 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - diff. array values --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -27,32 +27,32 @@ function cmp_function($value1, $value2) } // different heredoc strings - + // single line heredoc string $simple_heredoc = <<<EOT2 simple EOT2; - + // multiline heredoc string $multiline_heredoc = <<<EOT3 multiline heredoc with 123 and speci@! ch@r..\ncheck\talso EOT3; - + $array_arg = array( // numeric keys -2 => 9, - 8.9 => 8, + 8.9 => 8, 012 => 7, 0x34 => 6, // string keys 'key' => 5, //single quoted key - "two" => 4, //double quoted key + "two" => 4, //double quoted key " " => 0, // space as key - + // bool keys - TRUE => 100, + TRUE => 100, FALSE => 25, // null keys @@ -65,7 +65,7 @@ $array_arg = array( //heredoc keys $simple_heredoc => 75, $multiline_heredoc => 200, - + // default key 1, ); @@ -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..a5d14daab2 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - numeric data --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -27,16 +27,16 @@ function cmp_function($value1, $value2) } // Int array -$int_values = array(0 => 3, 1 => 2, 3 => 100, - 4 => 150, 5 => 25, 6 => 350, +$int_values = array(0 => 3, 1 => 2, 3 => 100, + 4 => 150, 5 => 25, 6 => 350, 7 => 0, 8 => -3, 9 => -1200); - + echo "\n-- Sorting Integer array --\n"; var_dump( usort($int_values, 'cmp_function') ); var_dump($int_values); // Octal array -$octal_values = array(0 => 056, 1 => 023, 2 => 00, +$octal_values = array(0 => 056, 1 => 023, 2 => 00, 3 => 015, 4 => -045, 5 => 01, 6 => -07); echo "\n-- Sorting Octal array --\n"; @@ -44,17 +44,17 @@ var_dump( usort($octal_values, 'cmp_function') ); var_dump($octal_values); // Hexadecimal array -$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, +$hex_values = array(0 => 0xAE, 1 => 0x2B, 2 => 0X10, 3 => -0xCF, 4 => 0X12, 5 => -0XF2); - + echo "\n-- Sorting Hex array --\n"; var_dump( usort($hex_values, 'cmp_function') ); var_dump($hex_values); // Float array -$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, +$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, 3 => 0, 4 => 0.5, 5 => 7.3e3, 6 => -9.34E-2); - + echo "\n-- Sorting Float array --\n"; var_dump( usort($float_values, 'cmp_function') ); var_dump($float_values); @@ -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_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index b8660e1438..922321c237 100644 --- a/ext/standard/tests/array/usort_variation5.phpt +++ b/ext/standard/tests/array/usort_variation5.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - string data --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -26,7 +26,7 @@ function cmp_function($value1, $value2) } } -// Different heredoc strings to be sorted +// Different heredoc strings to be sorted $empty_heredoc =<<<EOT EOT; @@ -46,7 +46,7 @@ EOT; // Single quoted strings $single_quoted_values = array( 0 => ' ', 1 => 'test', 3 => 'Hello', 4 => 'HELLO', - 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', + 5 => '', 6 => '\t', 7 => '0', 8 => '123Hello', 9 => '\'', 10 => '@#$%' ); @@ -56,8 +56,8 @@ var_dump($single_quoted_values); // Double quoted strings $double_quoted_values = array( - 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", - 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", + 0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", + 5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%" ); @@ -66,7 +66,7 @@ var_dump( usort($double_quoted_values, 'cmp_function') ); var_dump($double_quoted_values); // Heredoc strings -$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, +$heredoc_values = array(0 => $empty_heredoc, 1 => $simple_heredoc1, 2 => $simple_heredoc2, 3 => $multiline_heredoc); echo "\n-- Sorting Heredoc String values --\n"; diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 740da53f78..10b1e9929d 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - multi-dimensional arrays --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -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..55c4efa037 100644 --- a/ext/standard/tests/array/usort_variation7.phpt +++ b/ext/standard/tests/array/usort_variation7.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - Anonymous comparison function --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -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_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt index ab3532e8a7..87107f8009 100644 --- a/ext/standard/tests/array/usort_variation8.phpt +++ b/ext/standard/tests/array/usort_variation8.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - use built in functions as $cmp_functi --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -16,10 +16,10 @@ Test usort() function : usage variations - use built in functions as $cmp_functi echo "*** Testing usort() : usage variation ***\n"; // Initializing variables -$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", +$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", "p" => "Pineapple", "o" => "orange"); -// Testing library functions as comparison function +// Testing library functions as comparison function echo "\n-- Testing usort() with built-in 'cmp_function': strcasecmp() --\n"; $temp_array1 = $array_arg; var_dump( usort($temp_array1, 'strcasecmp') ); diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 538befa902..977c709149 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -3,7 +3,7 @@ Test usort() function : usage variations - referenced variables --FILE-- <?php /* Prototype : bool usort(array $array_arg, string $cmp_function) - * Description: Sort an array by values using a user-defined comparison function + * Description: Sort an array by values using a user-defined comparison function * Source code: ext/standard/array.c */ @@ -27,7 +27,7 @@ function cmp_function($value1, $value2) } // different variables which are used as elements of $array_arg -$value1 = -5; +$value1 = -5; $value2 = 100; $value3 = 0; $value4 = &$value1; @@ -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/assert.phpt b/ext/standard/tests/assert/assert.phpt index 08e1188d60..44fb6091db 100644 --- a/ext/standard/tests/assert/assert.phpt +++ b/ext/standard/tests/assert/assert.phpt @@ -4,13 +4,13 @@ assert() error_reporting = 2039 assert.active = 0 assert.warning = 1 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php function a($file,$line,$myev) -{ +{ echo "assertion failed $line,\"$myev\"\n"; } diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt index 80c42df473..74cdb6eda7 100644 --- a/ext/standard/tests/assert/assert03.phpt +++ b/ext/standard/tests/assert/assert03.phpt @@ -3,30 +3,30 @@ assert() - set callback using ini_set() --INI-- assert.active = 1 assert.warning = 0 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 1 --FILE-- <?php function a($file,$line,$myev) -{ +{ echo "assertion failed - a - $line,\"$myev\"\n"; } - + function b($file,$line,$myev) -{ +{ echo "assertion failed - b - $line,\"$myev\"\n"; } - + assert_options(ASSERT_ACTIVE,1); assert_options(ASSERT_QUIET_EVAL,1); assert_options(ASSERT_WARNING,0); - + $a = 0; - + assert_options(ASSERT_CALLBACK,"a"); assert('$a != 0'); - + /* Modify call back using ini_set() */ ini_set("assert.callback", "b"); assert('$a != 0'); diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt index 17606a8c27..a057ee4380 100644 --- a/ext/standard/tests/assert/assert04.phpt +++ b/ext/standard/tests/assert/assert04.phpt @@ -3,7 +3,7 @@ misc assert() tests tests --INI-- assert.active = 1 assert.warning = 1 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 0 --FILE-- @@ -11,36 +11,36 @@ assert.quiet_eval = 0 /* Assert not active */ assert_options(ASSERT_ACTIVE, 0); assert(1); - - + + /* Wrong parameter count in assert */ assert_options(ASSERT_ACTIVE, 1); assert(2, "failure", 3); - + /* Wrong parameter count in assert_options */ assert_options(ASSERT_ACTIVE, 0, 2); - + /* Wrong parameter name in assert_options */ $test="ASSERT_FRED"; assert_options($test, 1); - + /* Assert false */ assert(0); - - + + /* Assert false and bail*/ assert_options(ASSERT_BAIL, 1); assert(0); - + echo "not reached\n"; - + ?> --EXPECTF-- 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_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt index 73b3e73206..7db2a13b19 100644 --- a/ext/standard/tests/assert/assert_basic.phpt +++ b/ext/standard/tests/assert/assert_basic.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } @@ -18,7 +18,7 @@ var_dump($r2=assert($sa)); $sa = "0 == 0"; var_dump($r2=assert($sa)); -//Non string assert +//Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); --EXPECTF-- diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index 1280638416..e803bb0ccc 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } @@ -19,10 +19,10 @@ var_dump($r2=assert($sa)); $sa = "0 == 0"; var_dump($r2=assert($sa)); -//Non string assert +//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_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt index d6c150d0d0..42c59b1b9a 100644 --- a/ext/standard/tests/assert/assert_basic2.phpt +++ b/ext/standard/tests/assert/assert_basic2.phpt @@ -8,19 +8,19 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f2() +function f2() { echo "f2 called\n"; } -function f1() +function f1() { echo "f1 called\n"; } - + var_dump($o = assert_options(ASSERT_CALLBACK)); assert(0); - + var_dump($o= assert_options(ASSERT_CALLBACK, "f2")); var_dump($n= assert_options(ASSERT_CALLBACK)); assert(0); diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt index a7fd990cbe..044356c312 100644 --- a/ext/standard/tests/assert/assert_basic3.phpt +++ b/ext/standard/tests/assert/assert_basic3.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index 40b4e94de1..6c2baab437 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 0 assert.callback = f1 --FILE-- <?php -// Check the initial settings for all assert_options +// Check the initial settings for all assert_options //Using assert_options; echo "Initial values: assert_options(ASSERT_ACTIVE) => [".assert_options(ASSERT_ACTIVE)."]\n"; @@ -24,7 +24,7 @@ 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_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt index f4943cdf16..ac84a158f9 100644 --- a/ext/standard/tests/assert/assert_basic5.phpt +++ b/ext/standard/tests/assert/assert_basic5.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt index eb817db69b..e9b3f04b04 100644 --- a/ext/standard/tests/assert/assert_basic6.phpt +++ b/ext/standard/tests/assert/assert_basic6.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1($message) +function f1($message) { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt index 6e04060765..5e2519ab37 100644 --- a/ext/standard/tests/assert/assert_error.phpt +++ b/ext/standard/tests/assert/assert_error.phpt @@ -8,7 +8,7 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt index 191f0354aa..ae59afb40b 100644 --- a/ext/standard/tests/assert/assert_error1.phpt +++ b/ext/standard/tests/assert/assert_error1.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 1 assert.bail = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } @@ -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/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt index d1b6f1745f..aea86f5726 100644 --- a/ext/standard/tests/assert/assert_error2.phpt +++ b/ext/standard/tests/assert/assert_error2.phpt @@ -10,7 +10,7 @@ error_reporting = -1 display_errors = 1 --FILE-- <?php -function f1($script, $line, $message, $user_message) +function f1($script, $line, $message, $user_message) { echo "f1 called\n"; } diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt index 1ea52b0b9e..a23d468f7b 100644 --- a/ext/standard/tests/assert/assert_variation.phpt +++ b/ext/standard/tests/assert/assert_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -assert() - variation - test callback options using ini_get/ini_set/assert_options +assert() - variation - test callback options using ini_get/ini_set/assert_options --INI-- assert.active = 1 assert.warning = 0 @@ -8,15 +8,15 @@ assert.bail = 0 assert.quiet_eval = 0 --FILE-- <?php -function f1() +function f1() { echo "f1 called\n"; } -function f2() +function f2() { echo "f2 called\n"; } -function f3() +function f3() { echo "f3 called\n"; } diff --git a/ext/standard/tests/bug64370_var1.phpt b/ext/standard/tests/bug64370_var1.phpt index 87172c9b60..aca46a594d 100644 --- a/ext/standard/tests/bug64370_var1.phpt +++ b/ext/standard/tests/bug64370_var1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'] +Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'] --FILE-- <?php echo "\$_SERVER['REQUEST_TIME']: {$_SERVER['REQUEST_TIME']}\n"; 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/bug75220.phpt b/ext/standard/tests/bug75220.phpt index 0fdc6aa79a..f5820a12dd 100644 --- a/ext/standard/tests/bug75220.phpt +++ b/ext/standard/tests/bug75220.phpt @@ -15,7 +15,7 @@ class A extends B var_dump(is_callable('parent::foo')); var_dump(is_callable(array('parent', 'foo'))); } - + function __call($func, $args) { } 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..6d24ef979f 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test class_exists() function : basic functionality +Test class_exists() function : basic functionality --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing class_exists() : basic functionality ***\n"; @@ -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_error_001.phpt b/ext/standard/tests/class_object/class_exists_error_001.phpt index 0c9a121470..99c0b89b3c 100644 --- a/ext/standard/tests/class_object/class_exists_error_001.phpt +++ b/ext/standard/tests/class_object/class_exists_error_001.phpt @@ -3,9 +3,9 @@ Test class_exists() function : error conditions (wrong number of arguments) --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /** diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index 561a77fa2c..b847c0285c 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -3,9 +3,9 @@ Test class_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { 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..4b89921759 100644 --- a/ext/standard/tests/class_object/class_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt @@ -3,9 +3,9 @@ Test class_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { @@ -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 32895d393d..72182c8cbb 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -3,9 +3,9 @@ Test class_exists() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class caseSensitivityTest {} @@ -13,6 +13,6 @@ var_dump(class_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file 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_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index 34814aecd4..555099502d 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -3,9 +3,9 @@ Test get_class() function : error conditions - wrong number of arguments. --FILE-- <?php /* Prototype : proto string get_class([object object]) - * Description: Retrieves the class name + * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class() : error conditions ***\n"; 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 876438f74c..7d2151c9de 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 @@ -1,11 +1,11 @@ --TEST-- -Test get_class_methods() function : basic functionality +Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -18,7 +18,7 @@ class C { function f() {} function g() {} function h() {} -} +} echo "Argument is class name:\n"; var_dump( get_class_methods("C") ); @@ -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 2647a777f8..387cfd88fc 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 @@ -3,9 +3,9 @@ Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -16,7 +16,7 @@ class C { private function privC() {} protected function protC() {} public function pubC() {} - + public static function testFromC() { echo "Accessing C from C:\n"; var_dump(get_class_methods("C")); @@ -31,7 +31,7 @@ class D extends C { private function privD() {} protected function protD() {} public function pubD() {} - + public static function testFromD() { echo "Accessing C from D:\n"; var_dump(get_class_methods("C")); @@ -46,7 +46,7 @@ class X { private function privX() {} protected function protX() {} public function pubX() {} - + public static function testFromX() { echo "Accessing C from X:\n"; var_dump(get_class_methods("C")); @@ -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 d8063ec779..c74acccdc2 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 @@ -1,11 +1,11 @@ --TEST-- -Test get_class_methods() function : basic functionality +Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* @@ -23,10 +23,10 @@ class C implements I { private function privC() {} protected function protC() {} public function pubC() {} - + public static function testFromC() { echo "Accessing I from C:\n"; - var_dump(get_class_methods("I")); + var_dump(get_class_methods("I")); echo "Accessing C from C:\n"; var_dump(get_class_methods("C")); } @@ -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_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index 9888c26ae0..e606ab6937 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_class_methods() function : error conditions +Test get_class_methods() function : error conditions --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /* diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index abc2395209..8cdef12a7b 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -3,9 +3,9 @@ Test get_class_methods() function : usage variations - unexpected types --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ 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 2eae7f75d8..7dee5140a3 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 @@ -3,9 +3,9 @@ Test get_class_methods() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class_methods() : usage variations ***\n"; @@ -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 ab6421104a..640bbb7f88 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -3,9 +3,9 @@ Test get_class() function : usage variations - ensure class name case is preser --FILE-- <?php /* Prototype : proto string get_class([object object]) - * Description: Retrieves the class name + * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class caseSensitivityTest {} @@ -13,6 +13,6 @@ var_dump(get_class(new casesensitivitytest)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(19) "caseSensitivityTest" Done
\ No newline at end of file diff --git a/ext/standard/tests/class_object/get_class_vars_variation1.phpt b/ext/standard/tests/class_object/get_class_vars_variation1.phpt index 5ade3f240f..649e9ae5af 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation1.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_class_vars() function : usage variation +Test get_class_vars() function : usage variation --FILE-- <?php /* Prototype : array get_class_vars(string class_name) - * Description: Returns an array of default properties of the class. + * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_class_vars() : usage variation ***\n"; 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..726bb53ea1 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -1,18 +1,18 @@ --TEST-- -Test get_class_vars() function : testing visibility +Test get_class_vars() function : testing visibility --FILE-- <?php /* Prototype : array get_class_vars(string class_name) - * Description: Returns an array of default properties of the class. + * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class Ancestor { function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } @@ -22,15 +22,15 @@ class Tester extends Ancestor { public $pub = "public var"; protected $prot = "protected var"; private $priv = "private var"; - + static public $pubs = "public static var"; static protected $prots = "protected static var"; static private $privs = "private static var"; - + function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } @@ -40,7 +40,7 @@ class Child extends Tester { function test() { var_dump(get_class_vars("Tester")); } - + static function testStatic() { var_dump(get_class_vars("Tester")); } @@ -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_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt index bede42a762..123e9772cc 100644 --- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_classes() function : basic functionality +Test get_declared_classes() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -17,7 +17,7 @@ var_dump(get_declared_classes()); foreach (get_declared_classes() as $class) { if (!class_exists($class)) { - echo "Error: $class is not a valid class.\n"; + echo "Error: $class is not a valid class.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt index 7132410fb8..ff01feb360 100644 --- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_classes() function : error conditions +Test get_declared_classes() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_classes() : error conditions ***\n"; 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..60a46c37d0 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_classes() function : testing autoloaded classes +Test get_declared_classes() function : testing autoloaded classes --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -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_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt index 0fd665b250..a0ec715187 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_interfaces() function : basic functionality +Test get_declared_interfaces() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -17,7 +17,7 @@ var_dump(get_declared_interfaces()); foreach (get_declared_interfaces() as $interface) { if (!interface_exists($interface)) { - echo "Error: $interface is not a valid interface.\n"; + echo "Error: $interface is not a valid interface.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt index 1b11981492..63b02b85c3 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_interfaces() function : error conditions +Test get_declared_interfaces() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_interfaces() : error conditions ***\n"; 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..219dde98ac 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -3,9 +3,9 @@ Test get_declared_interfaces() function : autoloading of interfaces --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -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_basic_001.phpt b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt index 27962d6c56..69d8de9c31 100644 --- a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_traits() function : basic functionality +Test get_declared_traits() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -19,7 +19,7 @@ var_dump(get_declared_traits()); foreach (get_declared_traits() as $trait) { if (!trait_exists($trait)) { - echo "Error: $trait is not a valid trait.\n"; + echo "Error: $trait is not a valid trait.\n"; } } diff --git a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt index 522ad36a1b..0d35fa6d13 100644 --- a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_declared_traits() function : error conditions +Test get_declared_traits() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_declared_traits() : error conditions ***\n"; 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..4cb848d398 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -3,9 +3,9 @@ Test get_declared_traits() function : testing autoloaded traits --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ @@ -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 9a7de5c7ce..dde26e1a21 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 @@ -3,46 +3,46 @@ get_object_vars(): visibility from static methods (target object passed as arg) --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { private $hiddenPriv = 'A::hiddenPriv'; public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); } } Class B extends A { - private $hiddenPriv = 'B::hiddenPriv'; + private $hiddenPriv = 'B::hiddenPriv'; private $priv = 'B::priv'; protected $prot = 'B::prot'; public $pub = 'B::pub'; public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class C extends B { private $hiddenPriv = 'C::hiddenPriv'; - + public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class X { public static function test($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } @@ -58,7 +58,7 @@ A::test($b); echo "\n---( Unrelated class: )---\n"; X::test($b); ?> ---EXPECTF-- +--EXPECT-- ---( Global scope: )--- array(1) { 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 08d33bab05..8d7c45958e 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 @@ -3,30 +3,30 @@ get_object_vars(): visibility from non static methods (target object passed as a --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { private $hiddenPriv = 'A::hiddenPriv'; public function testA($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } Class B extends A { - private $hiddenPriv = 'B::hiddenPriv'; + private $hiddenPriv = 'B::hiddenPriv'; private $priv = 'B::priv'; protected $prot = 'B::prot'; public $pub = 'B::pub'; public function testB($b) { - echo __METHOD__ . "\n"; + echo __METHOD__ . "\n"; var_dump(get_object_vars($b)); - } + } } @@ -37,7 +37,7 @@ echo "\n---( Superclass: )---\n"; $b->testA($b); ?> ---EXPECTF-- +--EXPECT-- ---( Declaring class: )--- B::testB diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index c25ded8bb2..2cb37f4a91 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -3,9 +3,9 @@ Test get_object_vars() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_object_vars() : error conditions ***\n"; 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 40a5595af4..d0bf806763 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 @@ -3,9 +3,9 @@ get_object_vars() - ensure statics are not shown --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class A { @@ -15,6 +15,6 @@ Class A { $a = new A; var_dump(get_object_vars($a)); ?> ---EXPECTF-- +--EXPECT-- array(0) { }
\ No newline at end of file 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 cb69836c9b..ef227cd8a2 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 @@ -3,9 +3,9 @@ get_object_vars() - ensure references are preserved --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ $obj = new stdClass; @@ -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 fbcb21fbea..7351995b6d 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 @@ -3,9 +3,9 @@ Test get_object_vars() function : usage variations - unexpected types for argum --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_object_vars() : usage variations ***\n"; @@ -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_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index ed0644dce7..40c3dba279 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -3,9 +3,9 @@ Test get_parent_class() function : error conditions - wrong number of args. --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_parent_class() : error conditions ***\n"; 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 24859620d0..7ffff750b2 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 @@ -3,9 +3,9 @@ Test get_parent_class() function : variation - case sensitivity --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/010.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/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index 8dde525ae8..97f848168d 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -3,9 +3,9 @@ Test get_parent_class() function : usage variations - unexpected argument type. --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/interface_exists_error.phpt b/ext/standard/tests/class_object/interface_exists_error.phpt index 312665267f..bf95a43050 100644 --- a/ext/standard/tests/class_object/interface_exists_error.phpt +++ b/ext/standard/tests/class_object/interface_exists_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test interface_exists() function : error conditions +Test interface_exists() function : error conditions --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation1.phpt b/ext/standard/tests/class_object/interface_exists_variation1.phpt index f265d0085c..34d0e1e6b0 100644 --- a/ext/standard/tests/class_object/interface_exists_variation1.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test interface_exists() function : usage variation +Test interface_exists() function : usage variation --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : usage variation ***\n"; diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt index cfdb4dee17..de13c101ce 100644 --- a/ext/standard/tests/class_object/interface_exists_variation2.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test interface_exists() function : usage variation +Test interface_exists() function : usage variation --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : usage variation ***\n"; @@ -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..f6ec16d63d 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test interface_exists() function : autoloaded interface +Test interface_exists() function : autoloaded interface --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : autoloaded interface ***\n"; @@ -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..4b61269664 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test interface_exists() function : test autoload default value +Test interface_exists() function : test autoload default value --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing interface_exists() : test autoload default value ***\n"; @@ -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..644df705c7 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -6,22 +6,22 @@ is_a and is_subclass_of behaviour (with and without autoload) interface if_a { function f_a(); } - + interface if_b extends if_a { function f_b(); } class base { function _is_a($sub) { - + echo "\n>>> With Defined class\n"; echo str_pad('is_a( OBJECT:'.get_class($this).', '.$sub.') = ', 60) . (is_a($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_a(get_class($this), $sub) ? 'yes' : 'no')."\n"; - echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; + echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( OBJECT:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of($this, $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of(get_class($this), $sub) ? 'yes' : 'no')."\n"; echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.',false) = ', 60). (is_subclass_of(get_class($this), $sub , false) ? 'yes' : 'no')."\n"; - + // with autoload options.. echo ">>> With Undefined\n"; echo str_pad('is_a( STRING:undefB, '.$sub.',true) = ', 60). (is_a('undefB', $sub, true) ? 'yes' : 'no')."\n"; @@ -31,8 +31,8 @@ class base { } function test() { echo $this->_is_a('base'); - echo $this->_is_a('derived_a'); - echo $this->_is_a('if_a'); + echo $this->_is_a('derived_a'); + echo $this->_is_a('if_a'); echo $this->_is_a('undefA'); echo "\n"; } @@ -75,13 +75,13 @@ $t->test(); $t = new derived_b(); $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 3f5c7e01c4..0c106ee4f4 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -1,13 +1,11 @@ --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) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_a() : error conditions ***\n"; @@ -44,11 +42,11 @@ 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 -- Warning: is_a() expects at least 2 parameters, 1 given in %s on line 27 NULL -Done
\ No newline at end of file +Done 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..228141a8de 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -1,15 +1,13 @@ --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) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ -// Note: basic use cases in Zend/tests/is_a.phpt +// Note: basic use cases in Zend/tests/is_a.phpt echo "*** Testing is_a() : usage variations ***\n"; // Initialise function arguments not being substituted (if any) @@ -59,7 +57,7 @@ $values = array( // string data "string", 'String', - + // undefined data $undefined_var, 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..00a7e3e3ca 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -1,13 +1,11 @@ --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) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ class C { 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..5cf33ebdd2 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -1,13 +1,11 @@ --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) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_a() : usage variations ***\n"; @@ -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..62ccf6d342 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 @@ -1,11 +1,11 @@ --TEST-- -Test is_subclass_of() function : wrong number of args +Test is_subclass_of() function : wrong number of args --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_subclass_of() : error conditions ***\n"; @@ -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_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index d65bfcbc26..b1cb553abd 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/is_a.phpt spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt index a7ebab59c5..85f697654d 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt @@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 2 --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { 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 81878c12c5..3497ecc1f8 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 @@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing is_subclass_of() : usage variations ***\n"; @@ -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/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt index 0a4c575258..adecd5003d 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt @@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 w --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ // Note: basic use cases in Zend/tests/is_a.phpt spl_autoload_register(function ($className) { 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 7449f88572..44eaefbf56 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -3,9 +3,9 @@ method_exists() on userspace classes; static & non-static methods with various v --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ Class B { @@ -14,7 +14,7 @@ Class B { private function inherit_priv() {} static public function inherit_static_pub() {} static protected function inherit_static_prot() {} - static private function inherit_static_priv() {} + static private function inherit_static_priv() {} } Class C extends B { @@ -49,7 +49,7 @@ foreach ($methods as $method) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Using string class name)--- Does C::inherit_pub 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 bdaad02edf..6a17786b32 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -3,9 +3,9 @@ method_exists() on internal classes --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo " ---(Internal classes, using string class name)---\n"; @@ -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..c10763267c 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -3,20 +3,20 @@ method_exists() on non-existent class, with __autoload(). --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($name) { - echo "In autoload($name)\n"; + echo "In autoload($name)\n"; }); 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_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt index de1edfe04a..929d84a76f 100644 --- a/ext/standard/tests/class_object/method_exists_error_001.phpt +++ b/ext/standard/tests/class_object/method_exists_error_001.phpt @@ -3,9 +3,9 @@ Test method_exists() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing method_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index 4accebe20a..b41a1a11ae 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -3,9 +3,9 @@ Test method_exists() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt index ad97d49df7..5c924bdc5a 100644 --- a/ext/standard/tests/class_object/method_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt @@ -3,9 +3,9 @@ Test method_exists() function : usage variations - unexpected type for arg 2 --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($className) { 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 7357aaf6c0..f82dc01b9c 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -3,9 +3,9 @@ Test method_exists() function : variation - Case sensitivity --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing method_exists() : variation ***\n"; @@ -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_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt index e4564cbfa8..e40e08b32a 100644 --- a/ext/standard/tests/class_object/property_exists_error.phpt +++ b/ext/standard/tests/class_object/property_exists_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test property_exists() function : error conditions +Test property_exists() function : error conditions --FILE-- <?php /* Prototype : bool property_exists(mixed object_or_class, string property_name) - * Description: Checks if the object or class has a property + * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing property_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 430b9dd34a..1a9ff32659 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test property_exists() function : class auto loading +Test property_exists() function : class auto loading --FILE-- <?php /* Prototype : bool property_exists(mixed object_or_class, string property_name) - * Description: Checks if the object or class has a property + * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing property_exists() : class auto loading ***\n"; @@ -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 818f15695d..6548c32687 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 @@ -3,9 +3,9 @@ Test trait_exists() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ trait caseSensitivityTest {} @@ -13,6 +13,6 @@ var_dump(trait_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done
\ No newline at end of file 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..d587ec7d78 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test trait_exists() function : basic functionality +Test trait_exists() function : basic functionality --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing trait_exists() : basic functionality ***\n"; @@ -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_error_001.phpt b/ext/standard/tests/class_object/trait_exists_error_001.phpt index 70d18513db..b80f06ed2a 100644 --- a/ext/standard/tests/class_object/trait_exists_error_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_error_001.phpt @@ -3,9 +3,9 @@ Test trait_exists() function : error conditions (wrong number of arguments) --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ /** diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt index b51126c1ed..4fd2b8d5af 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt @@ -3,9 +3,9 @@ Test trait_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($traitName) { 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..fdd2da2dbb 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt @@ -3,9 +3,9 @@ Test trait_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($traitName) { @@ -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 f5ae7c8291..03c36b175b 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/chdir_basic-win32-mb.phpt b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt index 3cd5d71761..8d5b2ff986 100644 --- a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chdir() function : basic functionality +Test chdir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt index 4e18988076..81d3c7c9d1 100644 --- a/ext/standard/tests/dir/chdir_basic.phpt +++ b/ext/standard/tests/dir/chdir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test chdir() function : basic functionality +Test chdir() function : basic functionality --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error1.phpt b/ext/standard/tests/dir/chdir_error1.phpt index 794bd5c757..0f57ff5b2a 100644 --- a/ext/standard/tests/dir/chdir_error1.phpt +++ b/ext/standard/tests/dir/chdir_error1.phpt @@ -3,7 +3,7 @@ Test chdir() function : error conditions - Incorrect number of arguments --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt index 4f6272ce4f..2b23c90644 100644 --- a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error2.phpt b/ext/standard/tests/dir/chdir_error2.phpt index 6c322a2e3a..a3bbb63e6d 100644 --- a/ext/standard/tests/dir/chdir_error2.phpt +++ b/ext/standard/tests/dir/chdir_error2.phpt @@ -3,7 +3,7 @@ Test chdir() function : error conditions - Non-existent directory --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt index 5b9fa16486..90402f4c49 100644 --- a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ @@ -31,11 +31,11 @@ unset ($unset_var); // get a class class classA { var $dir_path; - + function __construct($dir) { $this->dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -74,7 +74,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -84,7 +84,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt index f456f1e1a7..c4c0431ccc 100644 --- a/ext/standard/tests/dir/chdir_variation1.phpt +++ b/ext/standard/tests/dir/chdir_variation1.phpt @@ -3,7 +3,7 @@ Test chdir() function : usage variations - different data type as $directory arg --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ @@ -25,11 +25,11 @@ unset ($unset_var); // get a class class classA { var $dir_path; - + function __construct($dir) { $this->dir_path = $dir; } - + public function __toString() { return "$this->dir_path"; } @@ -68,7 +68,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -78,7 +78,7 @@ $inputs = array( /*19*/ "$dir_path", 'string', $heredoc, - + // object data /*22*/ new classA($dir_path), diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt index 0d67b0fbc3..f28d57ab4f 100644 --- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt index 097ab56e00..9ca6a97748 100644 --- a/ext/standard/tests/dir/chdir_variation2.phpt +++ b/ext/standard/tests/dir/chdir_variation2.phpt @@ -3,7 +3,7 @@ Test chdir() function : usage variations - relative paths --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt index 8515756b17..2602e292ff 100644 --- a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test closedir() function : basic functionality +Test closedir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_basic.phpt b/ext/standard/tests/dir/closedir_basic.phpt index 2ef1aa7814..49080bb6a2 100644 --- a/ext/standard/tests/dir/closedir_basic.phpt +++ b/ext/standard/tests/dir/closedir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test closedir() function : basic functionality +Test closedir() function : basic functionality --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_error-win32-mb.phpt b/ext/standard/tests/dir/closedir_error-win32-mb.phpt index e5ca80b7d2..04c614e33d 100644 --- a/ext/standard/tests/dir/closedir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_error.phpt b/ext/standard/tests/dir/closedir_error.phpt index b7ec7e3a79..c2f7647ff9 100644 --- a/ext/standard/tests/dir/closedir_error.phpt +++ b/ext/standard/tests/dir/closedir_error.phpt @@ -3,7 +3,7 @@ Test closedir() function : error conditions - Pass incorrect number of arguments --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt index 09f7b95c45..1f917b2ab5 100644 --- a/ext/standard/tests/dir/closedir_variation1.phpt +++ b/ext/standard/tests/dir/closedir_variation1.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - different data types as $dir_handl --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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/closedir_variation2-win32-mb.phpt b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt index f46a99b872..26b4a5b8b7 100644 --- a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt index 303d47c84e..2437868d62 100644 --- a/ext/standard/tests/dir/closedir_variation2.phpt +++ b/ext/standard/tests/dir/closedir_variation2.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - close directory handle twice --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation3.phpt b/ext/standard/tests/dir/closedir_variation3.phpt index 7d7fdcbf0e..b9b5e67e7a 100644 --- a/ext/standard/tests/dir/closedir_variation3.phpt +++ b/ext/standard/tests/dir/closedir_variation3.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - close a file pointer --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/dir_basic-win32-mb.phpt b/ext/standard/tests/dir/dir_basic-win32-mb.phpt index d6c8ebca8f..d562c0b7e3 100644 --- a/ext/standard/tests/dir/dir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_basic-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt index 68ac552a6f..da364b9b60 100644 --- a/ext/standard/tests/dir/dir_basic.phpt +++ b/ext/standard/tests/dir/dir_basic.phpt @@ -2,7 +2,7 @@ Test dir() function : basic functionality --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c 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_error.phpt b/ext/standard/tests/dir/dir_error.phpt index 5bdf181b50..f2ef25cc87 100644 --- a/ext/standard/tests/dir/dir_error.phpt +++ b/ext/standard/tests/dir/dir_error.phpt @@ -1,8 +1,8 @@ --TEST-- -Test dir() function : error conditions +Test dir() function : error conditions --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt index 1fd6e61693..33d692c320 100644 --- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c @@ -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 940dbcff37..765417c62c 100644 --- a/ext/standard/tests/dir/dir_variation2.phpt +++ b/ext/standard/tests/dir/dir_variation2.phpt @@ -2,7 +2,7 @@ Test dir() function : usage variations - unexpected value for 'context' argument --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c @@ -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/dir_variation3.phpt b/ext/standard/tests/dir/dir_variation3.phpt index 91dc504713..f8d325874e 100644 --- a/ext/standard/tests/dir/dir_variation3.phpt +++ b/ext/standard/tests/dir/dir_variation3.phpt @@ -17,7 +17,7 @@ unlink($filename); ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c @@ -57,7 +57,7 @@ $permission_values = array( for($count = 0; $count < count($permission_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; - // try to remove the dir if exists & create + // try to remove the dir if exists & create $file_path = dirname(__FILE__); $dir_path = $file_path."/dir_variation3"; @chmod ($dir_path, 0777); // change dir permission to allow all operation @@ -71,7 +71,7 @@ for($count = 0; $count < count($permission_values); $count++) { // try to get dir handle $d = dir($dir_path); - var_dump($d); // dump the handle + var_dump($d); // dump the handle // try read directory, expected : false echo "-- reading contents --\n"; diff --git a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt index 71fe0b2979..156b836562 100644 --- a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation4.phpt b/ext/standard/tests/dir/dir_variation4.phpt index ae57413754..62b10b2a86 100644 --- a/ext/standard/tests/dir/dir_variation4.phpt +++ b/ext/standard/tests/dir/dir_variation4.phpt @@ -2,7 +2,7 @@ Test dir() function : usage variations - operate on previously opened directory --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index ea040bed8a..c7450eafc0 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -8,14 +8,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ /* - * Passing a file as argument to dir() function instead of a directory + * Passing a file as argument to dir() function instead of a directory * and checking if proper warning message is generated. */ diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt index 3fdfc789e2..71cbf1fa17 100644 --- a/ext/standard/tests/dir/dir_variation6.phpt +++ b/ext/standard/tests/dir/dir_variation6.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index ebf4a9ac24..ca168f90aa 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -17,13 +17,13 @@ unlink($filename); ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* +/* * remove the execute permission from the parent dir and test dir() on child dir * 1) remove write & execute permission from the 1st parent and test dir() * 2) remove execute permission from 2nd parent and test dir() diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index 4e7bd13f2f..5ecf449923 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -8,14 +8,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* - * Create more than one temporary directory & subdirectory and check if dir() function can open +/* + * Create more than one temporary directory & subdirectory and check if dir() function can open * those directories when wildcard characters are used to refer to them. */ @@ -31,7 +31,7 @@ $sub_dir_path = $dir_path."/sub_dir1"; /* with different wildcard characters */ -echo "-- wildcard = '*' --\n"; +echo "-- wildcard = '*' --\n"; var_dump( dir($file_path."/dir_var*") ); var_dump( dir($file_path."/*") ); diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt index 3756ffd42d..458d0b896f 100644 --- a/ext/standard/tests/dir/dir_variation9.phpt +++ b/ext/standard/tests/dir/dir_variation9.phpt @@ -8,13 +8,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* * Prototype : object dir(string $directory[, resource $context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Source code: ext/standard/dir.c */ -/* +/* * Checking the behavior of dir() function by passing directories which * have valid and invalid relative path. */ diff --git a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt index f3d2a6d1d4..7ebbaa470f 100644 --- a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt @@ -9,8 +9,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory - * Source code: ext/standard/dir.c + * Description: Gets the current directory + * Source code: ext/standard/dir.c */ /* diff --git a/ext/standard/tests/dir/getcwd_basic.phpt b/ext/standard/tests/dir/getcwd_basic.phpt index f09eb7165a..ef720d0959 100644 --- a/ext/standard/tests/dir/getcwd_basic.phpt +++ b/ext/standard/tests/dir/getcwd_basic.phpt @@ -3,8 +3,8 @@ Test getcwd() function : basic functionality --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory - * Source code: ext/standard/dir.c + * Description: Gets the current directory + * Source code: ext/standard/dir.c */ /* diff --git a/ext/standard/tests/dir/getcwd_error.phpt b/ext/standard/tests/dir/getcwd_error.phpt index 1fcfa47a9d..153f303677 100644 --- a/ext/standard/tests/dir/getcwd_error.phpt +++ b/ext/standard/tests/dir/getcwd_error.phpt @@ -3,7 +3,7 @@ Test getcwd() function : error conditions - Incorrect number of arguments --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory + * Description: Gets the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt index ab332d05e2..f9d06bfdb7 100644 --- a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test opendir() function : basic functionality +Test opendir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_basic.phpt b/ext/standard/tests/dir/opendir_basic.phpt index 373d25c470..17ada17ea6 100644 --- a/ext/standard/tests/dir/opendir_basic.phpt +++ b/ext/standard/tests/dir/opendir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test opendir() function : basic functionality +Test opendir() function : basic functionality --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt index 59ab389e10..e363de4806 100644 --- a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error1.phpt b/ext/standard/tests/dir/opendir_error1.phpt index ccfed4bf05..92b8eee1bd 100644 --- a/ext/standard/tests/dir/opendir_error1.phpt +++ b/ext/standard/tests/dir/opendir_error1.phpt @@ -3,7 +3,7 @@ Test opendir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 9156585938..1c724097b0 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt index 0ba4702081..5d43962378 100644 --- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ @@ -33,7 +33,7 @@ unset ($unset_var); // get a class class classA { - public function __toString() + public function __toString() { return "Class A object"; } @@ -72,7 +72,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -82,7 +82,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..ea9cac504d 100644 --- a/ext/standard/tests/dir/opendir_variation2.phpt +++ b/ext/standard/tests/dir/opendir_variation2.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - different data types as $context ar --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ @@ -27,7 +27,7 @@ unset ($unset_var); // get a class class classA { - public function __toString() + public function __toString() { return "Class A object"; } @@ -66,7 +66,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -76,7 +76,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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_variation3-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt index 6ffd12aaff..74d0a6b982 100644 --- a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation3.phpt b/ext/standard/tests/dir/opendir_variation3.phpt index 1e9a62f394..3de0dd3701 100644 --- a/ext/standard/tests/dir/opendir_variation3.phpt +++ b/ext/standard/tests/dir/opendir_variation3.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - open a directory twice --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt index d77b1156c3..901b13c4a8 100644 --- a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation4.phpt b/ext/standard/tests/dir/opendir_variation4.phpt index 3a42c8d9c1..b20641740b 100644 --- a/ext/standard/tests/dir/opendir_variation4.phpt +++ b/ext/standard/tests/dir/opendir_variation4.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - different relative paths --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index b5fc83caba..f9bb38c68e 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ 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/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index caca6a0504..f54a2ad4ae 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ @@ -28,7 +28,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( opendir($file_path . "/opendir_var*") ); var_dump( opendir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index e16235ba87..f3fc0bd6df 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ @@ -28,7 +28,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( opendir($file_path . "/opendir_var*") ); var_dump( opendir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt index a75859b9fc..2ad41b1d31 100644 --- a/ext/standard/tests/dir/opendir_variation7.phpt +++ b/ext/standard/tests/dir/opendir_variation7.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ @@ -68,7 +68,7 @@ foreach ($permission_values as $perm) { var_dump( chmod($dir_path, $perm) ); var_dump($dh = opendir($dir_path)); - + if (is_resource($dh)) { closedir($dh); } diff --git a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt index f9a7db632d..90cb81a27d 100644 --- a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readdir() function : basic functionality +Test readdir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.C */ diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt index c6d1d79d79..572a9a0799 100644 --- a/ext/standard/tests/dir/readdir_basic.phpt +++ b/ext/standard/tests/dir/readdir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test readdir() function : basic functionality +Test readdir() function : basic functionality --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.C */ diff --git a/ext/standard/tests/dir/readdir_error-win32-mb.phpt b/ext/standard/tests/dir/readdir_error-win32-mb.phpt index 21eaad4b06..1388987259 100644 --- a/ext/standard/tests/dir/readdir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -38,7 +38,7 @@ closedir($dir_handle); <?php $path = dirname(__FILE__) . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_error"; rmdir($path); -?> +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt index 24fbad37a9..23ba3dfa63 100644 --- a/ext/standard/tests/dir/readdir_error.phpt +++ b/ext/standard/tests/dir/readdir_error.phpt @@ -3,7 +3,7 @@ Test readdir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -32,7 +32,7 @@ closedir($dir_handle); <?php $path = dirname(__FILE__) . "/readdir_error"; rmdir($path); -?> +?> --EXPECTF-- *** Testing readdir() : error conditions *** diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt index d392e67114..7b282dbb9e 100644 --- a/ext/standard/tests/dir/readdir_variation1.phpt +++ b/ext/standard/tests/dir/readdir_variation1.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - different data types as $dir_handle --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -65,7 +65,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..513a22b0cc 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -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..ac6d37aa15 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - empty directories --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -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..2d1e6a6fba 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readdir() function : usage variations - sub-directories +Test readdir() function : usage variations - sub-directories --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -34,7 +34,7 @@ create_files($path_sub, 2); $dir_handle = opendir($path_top); while(FALSE !== ($file = readdir($dir_handle))) { - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; @@ -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..8925b20ab4 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test readdir() function : usage variations - sub-directories +Test readdir() function : usage variations - sub-directories --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -28,7 +28,7 @@ create_files($path_sub, 2); $dir_handle = opendir($path_top); while(FALSE !== ($file = readdir($dir_handle))) { - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; @@ -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_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt index 1c766a51d5..6540d8e571 100644 --- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt @@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ /* - * Pass a directory handle pointing to a directory that contains + * Pass a directory handle pointing to a directory that contains * files with different file names to test how readdir() reads them */ @@ -42,7 +42,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), @@ -66,11 +66,11 @@ foreach($inputs as $key => $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt index acbb8f32ab..9b04a986a6 100644 --- a/ext/standard/tests/dir/readdir_variation4.phpt +++ b/ext/standard/tests/dir/readdir_variation4.phpt @@ -3,12 +3,12 @@ Test readdir() function : usage variations - different file names --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ /* - * Pass a directory handle pointing to a directory that contains + * Pass a directory handle pointing to a directory that contains * files with different file names to test how readdir() reads them */ @@ -36,7 +36,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), @@ -60,11 +60,11 @@ foreach($inputs as $key => $input) { echo "\n-- Call to readdir() --\n"; $dir_handle = opendir($dir_path); while(FALSE !== ($file = readdir($dir_handle))){ - + // different OS order files differently so will // store file names into an array so can use sorted in expected output $contents[] = $file; - + // remove files while going through directory @unlink($dir_path . $file); } diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt index 0ed40964a6..8c12f13dfb 100644 --- a/ext/standard/tests/dir/readdir_variation5.phpt +++ b/ext/standard/tests/dir/readdir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -55,7 +55,7 @@ $permission_values = array( $iterator = 1; foreach($permission_values as $perm) { echo "\n-- Iteration $iterator --\n"; - + if (is_dir($dir_path)) { chmod ($dir_path, 0777); // change dir permission to allow all operation rmdir ($dir_path); diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index 8201e21f7a..f439920ada 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -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..0da7fbd8be 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - operate on previously opened direct --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ @@ -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/readdir_variation7.phpt b/ext/standard/tests/dir/readdir_variation7.phpt index 2cd23b8bfc..bff87ced0d 100644 --- a/ext/standard/tests/dir/readdir_variation7.phpt +++ b/ext/standard/tests/dir/readdir_variation7.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - use file pointers --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt index aaf01aab09..bec721d3c5 100644 --- a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rewinddir() function : basic functionality +Test rewinddir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt index 3571808f85..2d1f783f57 100644 --- a/ext/standard/tests/dir/rewinddir_basic.phpt +++ b/ext/standard/tests/dir/rewinddir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test rewinddir() function : basic functionality +Test rewinddir() function : basic functionality --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt index 9fa264ba4c..bc107704a0 100644 --- a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_error.phpt b/ext/standard/tests/dir/rewinddir_error.phpt index 2019c4a457..b3bb02bca3 100644 --- a/ext/standard/tests/dir/rewinddir_error.phpt +++ b/ext/standard/tests/dir/rewinddir_error.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : error conditions - incorrect number of args --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt index 41c11a2ae7..f99e84231d 100644 --- a/ext/standard/tests/dir/rewinddir_variation1.phpt +++ b/ext/standard/tests/dir/rewinddir_variation1.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - different data types as $dir_hand --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ @@ -56,7 +56,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -66,7 +66,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt index b8f36d7eb2..a3f5e8ecc9 100644 --- a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt index aa18641292..6b06a56d95 100644 --- a/ext/standard/tests/dir/rewinddir_variation2.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - operate on a closed directory --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation3.phpt b/ext/standard/tests/dir/rewinddir_variation3.phpt index a1ec7f80d4..2a2af89e63 100644 --- a/ext/standard/tests/dir/rewinddir_variation3.phpt +++ b/ext/standard/tests/dir/rewinddir_variation3.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - file pointers --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index 8c81f3d45b..f1cc3e11c8 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test scandir() function : basic functionality +Test scandir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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..668f659851 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test scandir() function : basic functionality +Test scandir() function : basic functionality --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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_error1-win32-mb.phpt b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt index dcb15d46a0..6c1ce72a44 100644 --- a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_error1.phpt b/ext/standard/tests/dir/scandir_error1.phpt index f603b696c9..7fbffba0cc 100644 --- a/ext/standard/tests/dir/scandir_error1.phpt +++ b/ext/standard/tests/dir/scandir_error1.phpt @@ -3,7 +3,7 @@ Test scandir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index 2044471c66..b5bfc28c8e 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt index 6b664a2d2e..ccd5bb967a 100644 --- a/ext/standard/tests/dir/scandir_variation1.phpt +++ b/ext/standard/tests/dir/scandir_variation1.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index b24c2ce550..e30994261f 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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..958079dcb9 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different sorting constants --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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..7ee58ad450 100644 --- a/ext/standard/tests/dir/scandir_variation2-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt @@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..a3ee88a3be 100644 --- a/ext/standard/tests/dir/scandir_variation2.phpt +++ b/ext/standard/tests/dir/scandir_variation2.phpt @@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -64,7 +64,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -74,7 +74,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..4a81d209e5 100644 --- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -69,7 +69,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -79,7 +79,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..a75396aecd 100644 --- a/ext/standard/tests/dir/scandir_variation3.phpt +++ b/ext/standard/tests/dir/scandir_variation3.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - diff data types as $context arg --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -63,7 +63,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -73,7 +73,7 @@ $inputs = array( /*19*/ "string", 'string', $heredoc, - + // object data /*22*/ new classA(), @@ -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..73064d779f 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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..09dedfffd2 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different relative paths --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index a17e8a5d35..d6d3c79e40 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -30,7 +30,7 @@ unlink($filename); echo "*** Testing scandir() : usage variations ***\n"; -/* +/* * create the temporary directory : * scandir_variation5 ( parent ) * |-> sub_dir ( sub parent ) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index c4467d1536..754c615290 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -29,7 +29,7 @@ mkdir($sub_dir_path); // with different wildcard characters -echo "\n-- Wildcard = '*' --\n"; +echo "\n-- Wildcard = '*' --\n"; var_dump( scandir($file_path . "/scandir_var*") ); var_dump( scandir($file_path . "/*") ); diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index c2d8686d81..6ef4b67ce9 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -53,7 +53,7 @@ $permission_values = array( $iterator = 1; foreach ($permission_values as $perm) { echo "\n-- Iteration $iterator --\n"; - + // Remove the directory if already exists if (is_dir($dir_path)){ chmod ($dir_path, 0777); // change dir permission to allow all operation @@ -63,7 +63,7 @@ foreach ($permission_values as $perm) { // change the dir permisson to test dir on it var_dump( chmod($dir_path, $perm) ); - + var_dump(scandir($dir_path)); $iterator++; } @@ -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_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt index 9fead1e455..f30645da45 100644 --- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -42,7 +42,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt index 9311d030c1..4e96e04a4e 100644 --- a/ext/standard/tests/dir/scandir_variation8.phpt +++ b/ext/standard/tests/dir/scandir_variation8.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different file names --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -36,7 +36,7 @@ $inputs = array( 12.3456789000e10, 12.3456789000E-10, .5, - + // empty data /*10*/ "", array(), diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index f2ec130e5d..031b4389af 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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..0435a8c3f3 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different ints as $sorting_order ar --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ @@ -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/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt index 73aac5b43c..0accb2c85f 100644 --- a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt +++ b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt @@ -2,7 +2,7 @@ Directory class behaviour. --FILE-- <?php -/* +/* * Prototype: object dir(string directory[, resource context]) * Description: Directory class with properties, handle and class and methods read, rewind and close * Class is defined in ext/standard/dir.c diff --git a/ext/standard/tests/directory/bug74589_utf8.phpt b/ext/standard/tests/directory/bug74589_utf8.phpt index deba03c582..686e005b8a 100644 --- a/ext/standard/tests/directory/bug74589_utf8.phpt +++ b/ext/standard/tests/directory/bug74589_utf8.phpt @@ -33,7 +33,7 @@ echo shell_exec("$php -n $test_file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%sbug74589_新建文件夹" string(%d) "%sbug74589_新建文件夹%etest.php" bool(true) diff --git a/ext/standard/tests/file/004.phpt b/ext/standard/tests/file/004.phpt index 3fead8b215..f1fab47ac3 100644 --- a/ext/standard/tests/file/004.phpt +++ b/ext/standard/tests/file/004.phpt @@ -20,7 +20,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $old_int = $int = time() / 1000; $ret = file_put_contents("TEST3", $int); echo "Float Test: "; @@ -30,7 +30,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = file_put_contents("TEST4", __FILE__); echo "Bool Test: "; if ($ret !== FALSE && md5(__FILE__) == md5_file("TEST4")) { @@ -39,7 +39,7 @@ file_put_contents() test echo 'FAIL'; } echo "\n"; - + $ret = @file_put_contents("TEST5", $_SERVER); echo "Array Test: "; if ($ret !== FALSE && @md5(implode('', $_SERVER)) == md5_file("TEST5")) { diff --git a/ext/standard/tests/file/005_basic.phpt b/ext/standard/tests/file/005_basic.phpt index 329fd15773..5ed1118902 100644 --- a/ext/standard/tests/file/005_basic.phpt +++ b/ext/standard/tests/file/005_basic.phpt @@ -39,7 +39,7 @@ echo "\n*** Done ***\n"; unlink(dirname(__FILE__)."/005_basic.tmp"); unlink(dirname(__FILE__)."/005_basic"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing the basic functionality with file *** %d:%s:%s:%d:%d:%d %d:%s:%s:%d:%d:%d diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index 6ac22914db..20ba3a7fc0 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions : error conditions +Test fileatime(), filemtime(), filectime() & touch() functions : error conditions --FILE-- <?php /* @@ -56,7 +56,7 @@ var_dump( touch(__FILE__, 10, 100, 123) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** -- Testing with Non-existing files -- diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index 68fa209b24..ffcdc33cd6 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -10,12 +10,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -31,13 +31,13 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -45,7 +45,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -120,7 +120,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -134,8 +134,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt index f2bf19f6a3..7e5eedc2b1 100644 --- a/ext/standard/tests/file/005_variation.phpt +++ b/ext/standard/tests/file/005_variation.phpt @@ -13,12 +13,12 @@ if (getenv("SKIP_SLOW_TESTS")) { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,13 +34,13 @@ if (getenv("SKIP_SLOW_TESTS")) { Description: Prints access, modification and change times of a file */ function stat_fn( $filename ) { - echo "-- File access time is => "; + echo "-- File access time is => "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n"; clearstatcache(); @@ -48,7 +48,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); @@ -135,7 +135,7 @@ stat_fn($file_name2); sleep(2); /* set to access(creation time of the file) time */ -var_dump( touch($file_name2, @date(fileatime($file_name2))) ); +var_dump( touch($file_name2, @date(fileatime($file_name2))) ); stat_fn($file_name2); sleep(2); @@ -149,8 +149,8 @@ var_dump( touch($file_name2, 10) ); stat_fn($file_name2); var_dump( touch($file_name2, 10, 20) ); stat_fn($file_name2); - -/* touch() after renaming the file */ + +/* touch() after renaming the file */ rename($file_name2, "$file_path/005_variation_touch_new.tmp"); stat_fn("$file_path/005_variation_touch_new.tmp"); diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 63b3c1db67..8508ecf7fb 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index f365174a84..6d4ca5e83d 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ function stat_fn( $filename ) { echo "\n-- File '$filename' --\n"; - echo "-- File access time is => "; + echo "-- File access time is => "; echo fileatime($filename)."\n"; clearstatcache(); - echo "-- File modification time is => "; + echo "-- File modification time is => "; echo filemtime($filename)."\n"; clearstatcache(); - echo "-- inode change time is => "; + echo "-- inode change time is => "; echo filectime($filename)."\n"; clearstatcache(); - + } diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 733be71126..73a70e358f 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -29,7 +29,7 @@ unlink($filename); */ $path = dirname(__FILE__); -echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; +echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; fopen($path."/perm.tmp", "w"); var_dump( chmod($path."/perm.tmp", 0755 ) ); printf("%o", fileperms($path."/perm.tmp") ); @@ -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_error.phpt b/ext/standard/tests/file/006_error.phpt index c35eba2128..04cc274ecc 100644 --- a/ext/standard/tests/file/006_error.phpt +++ b/ext/standard/tests/file/006_error.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ) - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index e2ec2f1a22..7ede7b8bbc 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ @@ -40,7 +40,7 @@ $count = 1; echo "-- Testing all permission from octal 0000 to octal 0777 on file and dir --\n"; for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Iteration $count --\n"; - var_dump( chmod($file_name, $mode) ); + var_dump( chmod($file_name, $mode) ); printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); @@ -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..f40932645b 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -19,12 +19,12 @@ unlink($filename); ?> --FILE-- <?php -/* +/* Prototype: int fileperms ( string $filename ); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ @@ -72,7 +72,7 @@ foreach($perms_array as $permission) { printf("%o", fileperms($file_name) ); echo "\n"; clearstatcache(); - + var_dump( chmod($dir_name, $permission) ); printf("%o", fileperms($dir_name) ); echo "\n"; @@ -88,7 +88,7 @@ chmod(dirname(__FILE__)."/006_variation2", 0777); unlink(dirname(__FILE__)."/006_variation2.tmp"); rmdir(dirname(__FILE__)."/006_variation2"); ?> ---EXPECTF-- +--EXPECTF-- *** Testing fileperms() & chmod() : usage variations *** *** Testing fileperms(), chmod() with miscellaneous permissions *** @@ -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_basic.phpt b/ext/standard/tests/file/007_basic.phpt index 9fb473b368..ceb9b29943 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -2,8 +2,8 @@ Test fopen(), fclose() & feof() functions: basic functionality --FILE-- <?php -/* - Prototype: resource fopen(string $filename, string $mode +/* + Prototype: resource fopen(string $filename, string $mode [, bool $use_include_path [, resource $context]] ); Description: Opens file or URL. diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 1e94e90359..2b315a5cac 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -13,8 +13,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com> Description: Closes an open file pointer Prototype: bool feof ( resource $handle ) - Description: Returns TRUE if the file pointer is at EOF or an error occurs - (including socket timeout); otherwise returns FALSE. + Description: Returns TRUE if the file pointer is at EOF or an error occurs + (including socket timeout); otherwise returns FALSE. */ echo "*** Testing error conditions for fopen(), fclsoe() & feof() ***\n"; @@ -29,7 +29,7 @@ $fp = fopen(__FILE__, "r"); fclose($fp); var_dump( fclose($fp) ); // closed handle var_dump( fclose(__FILE__) ); // invalid handle -var_dump( fclose() ); // zero argument +var_dump( fclose() ); // zero argument //feof() var_dump( feof($fp) ); // closed handle @@ -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_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index 2731b3bdc9..6cba146655 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r" mode +Test fopen and fclose() functions - usage variations - "r" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation1.tmp"); diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt index 3093535e64..2981ef7d4c 100644 --- a/ext/standard/tests/file/007_variation10.phpt +++ b/ext/standard/tests/file/007_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+t" mode +Test fopen and fclose() functions - usage variations - "r+t" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation10.tmp"); diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt index 68b8396639..68a0e8ccd0 100644 --- a/ext/standard/tests/file/007_variation11-win32-mb.phpt +++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index 242b38cada..a567b72b03 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt index 92ec32eb22..c884f47f42 100644 --- a/ext/standard/tests/file/007_variation11.phpt +++ b/ext/standard/tests/file/007_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation11.tmp"); diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt index 87bfc45c49..d3d26e2996 100644 --- a/ext/standard/tests/file/007_variation12-win32.phpt +++ b/ext/standard/tests/file/007_variation12-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt index 43ca4f78ff..c56605ac62 100644 --- a/ext/standard/tests/file/007_variation12.phpt +++ b/ext/standard/tests/file/007_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -54,7 +54,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation12.tmp"); diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt index 6c6d22f64e..fabcde90cc 100644 --- a/ext/standard/tests/file/007_variation13-win32.phpt +++ b/ext/standard/tests/file/007_variation13-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt index 6c416d1103..9d3e6265b5 100644 --- a/ext/standard/tests/file/007_variation13.phpt +++ b/ext/standard/tests/file/007_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) @@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation13.tmp"); diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt index af07d1652a..ebcad6d830 100644 --- a/ext/standard/tests/file/007_variation14.phpt +++ b/ext/standard/tests/file/007_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+t" mode +Test fopen and fclose() functions - usage variations - "a+t" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+t") ); //Opening the non-existing file in "a+t" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation14.tmp"); diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index e3a7e0d8b4..fb5d6ae441 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xt" mode +Test fopen and fclose() functions - usage variations - "xt" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode /* Test fopen() and fclose(): Opening the file in "xt" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xt" mode, + checking for the warning msg when trying to open an existing file in "xt" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xt"); //Opening the existing data file in 'xt' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation15.tmp"); @@ -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_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index c48776a4cd..633299dedf 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+t" mode +Test fopen and fclose() functions - usage variations - "x+t" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+t" mode /* Test fopen() and fclose(): Opening the file in "x+t" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+t" mode, + checking for the warning msg when trying to open an existing file in "x+t" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+t"); //Opening the existing data file in "x+t" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation16.tmp"); diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt index 716dbbacb7..d3408e9dbb 100644 --- a/ext/standard/tests/file/007_variation17.phpt +++ b/ext/standard/tests/file/007_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rb" mode +Test fopen and fclose() functions - usage variations - "rb" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation17.tmp"); diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt index 5d9b1ea212..88350b8426 100644 --- a/ext/standard/tests/file/007_variation18.phpt +++ b/ext/standard/tests/file/007_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+b" mode +Test fopen and fclose() functions - usage variations - "r+b" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation18.tmp"); diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt index ebb19a0b2e..0731d454bb 100644 --- a/ext/standard/tests/file/007_variation19.phpt +++ b/ext/standard/tests/file/007_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wb" mode +Test fopen and fclose() functions - usage variations - "wb" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wb") ); //Opening the non-existing file in "wb" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation19.tmp"); diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt index d456214c27..deb51266ee 100644 --- a/ext/standard/tests/file/007_variation2.phpt +++ b/ext/standard/tests/file/007_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+" mode +Test fopen and fclose() functions - usage variations - "r+" mode --FILE-- <?php /* @@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation2.tmp"); diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt index 26c5bb7152..3eddec4258 100644 --- a/ext/standard/tests/file/007_variation20.phpt +++ b/ext/standard/tests/file/007_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+b" mode +Test fopen and fclose() functions - usage variations - "w+b" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+b") ); //Opening the non-existing file in "w+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation20.tmp"); diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt index 62d7f84568..c70aaad784 100644 --- a/ext/standard/tests/file/007_variation21.phpt +++ b/ext/standard/tests/file/007_variation21.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "ab" mode +Test fopen and fclose() functions - usage variations - "ab" mode --FILE-- <?php /* @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "ab") ); //Opening the non-existing file in "ab" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation21.tmp"); diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt index 106cd4b6f4..63deee4f84 100644 --- a/ext/standard/tests/file/007_variation22.phpt +++ b/ext/standard/tests/file/007_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+b" mode +Test fopen and fclose() functions - usage variations - "a+b" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+b") ); //Opening the non-existing file in "a+b" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation22.tmp"); diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index 5144f0765f..cfff815084 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xb" mode +Test fopen and fclose() functions - usage variations - "xb" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode /* Test fopen() and fclose(): Opening the file in "xb" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xb" mode, + checking for the warning msg when trying to open an existing file in "xb" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xb"); //Opening the existing data file in 'xb' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation23.tmp"); @@ -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_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index b9c819f0a5..d898ba7b52 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+b" mode +Test fopen and fclose() functions - usage variations - "x+b" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+b" mode /* Test fopen() and fclose(): Opening the file in "x+b" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+b" mode, + checking for the warning msg when trying to open an existing file in "x+b" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+b"); //Opening the existing data file in "x+b" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation24.tmp"); diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt index b2a276cacf..f4ae03658f 100644 --- a/ext/standard/tests/file/007_variation3.phpt +++ b/ext/standard/tests/file/007_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w" mode +Test fopen and fclose() functions - usage variations - "w" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w") ); //Opening the non-existing file in "w" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation3.tmp"); diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt index 417974d3be..0dabc5b9ad 100644 --- a/ext/standard/tests/file/007_variation4.phpt +++ b/ext/standard/tests/file/007_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+" mode +Test fopen and fclose() functions - usage variations - "w+" mode --FILE-- <?php /* @@ -49,7 +49,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+") ); //Opening the non-existing file in "w+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation4.tmp"); diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt index 4c54f473b2..51e366d291 100644 --- a/ext/standard/tests/file/007_variation5.phpt +++ b/ext/standard/tests/file/007_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a" mode +Test fopen and fclose() functions - usage variations - "a" mode --FILE-- <?php /* @@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "a") ); //Opening the non-existing file in "a" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation5.tmp"); diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt index 47bd3628d4..92c0171751 100644 --- a/ext/standard/tests/file/007_variation6.phpt +++ b/ext/standard/tests/file/007_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+" mode +Test fopen and fclose() functions - usage variations - "a+" mode --FILE-- <?php /* @@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+") ); //Opening the non-existing file in "a+" mode, which will be created var_dump( file_exists($file) ); //Check for the existence of file -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation6.tmp"); diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 24bf9720cd..b1b15c81c5 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x" mode +Test fopen and fclose() functions - usage variations - "x" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x" mode /* Test fopen() and fclose(): Opening the file in "x" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x" mode, + checking for the warning msg when trying to open an existing file in "x" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x"); //Opening the existing data file in 'x' mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation7.tmp"); @@ -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_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index a57c76bd67..fae6932048 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+" mode +Test fopen and fclose() functions - usage variations - "x+" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+" mode /* Test fopen() and fclose(): Opening the file in "x+" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+" mode, + checking for the warning msg when trying to open an existing file in "x+" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -37,7 +37,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+"); //Opening the existing data file in "x+" mode to check for the warning message -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation8.tmp"); diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt index 7d8ebbee91..ab5f1ca01d 100644 --- a/ext/standard/tests/file/007_variation9.phpt +++ b/ext/standard/tests/file/007_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rt" mode +Test fopen and fclose() functions - usage variations - "rt" mode --FILE-- <?php /* @@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; +echo "*** Done ***\n"; --CLEAN-- <?php unlink(dirname(__FILE__)."/007_variation9.tmp"); diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt index 996b060cea..5fd0f9659f 100644 --- a/ext/standard/tests/file/basename-win32.phpt +++ b/ext/standard/tests/file/basename-win32.phpt @@ -10,10 +10,10 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php -/* +/* * proto string basename(string path [, string suffix]) * Function is implemented in ext/standard/string.c - */ + */ $file_paths = array ( /* simple paths */ array("bar"), @@ -33,15 +33,15 @@ $file_paths = array ( array("bar.zip", "bar.zip"), array("\\foo\\bar.zip", ".zip"), array("foo\\bar.zip", ".zip"), - array("\\bar.zip", ".zip"), + array("\\bar.zip", ".zip"), /* paths with suffix and trailing slashes with suffix removal*/ array("bar.zip\\", ".zip"), array("\\bar.zip\\", ".zip"), array("\\foo\\bar.zip\\", ".zip"), array("foo\\bar.zip\\", ".zip"), - array("\\bar.zip\\", ".zip"), - + array("\\bar.zip\\", ".zip"), + /* paths with basename only suffix, with suffix removal*/ array("\\.zip", ".zip"), array(".zip", ".zip"), @@ -90,7 +90,7 @@ $file_path_variations = array ( /* path with spaces */ array(" "), array(' '), - + /* empty paths */ array(""), array(''), @@ -104,8 +104,8 @@ function check_basename( $path_arrays ) { if( 1 == count($path) ) { // no suffix provided var_dump( basename($path[0]) ); } else { // path as well as suffix provided, - var_dump( basename($path[0], $path[1]) ); - } + var_dump( basename($path[0], $path[1]) ); + } } } @@ -116,13 +116,13 @@ echo "\n*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "\n*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( basename() ); // more than expected no. of arguments var_dump( basename("\\blah\\tmp\\bar.zip", ".zip", ".zip") ); -// passing invalid type arguments +// passing invalid type arguments $object = new stdclass; var_dump( basename( array("string\\bar") ) ); var_dump( basename( array("string\\bar"), "bar" ) ); diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt Binary files differindex a9b4389b5a..c0e7498f14 100644 --- a/ext/standard/tests/file/basename.phpt +++ b/ext/standard/tests/file/basename.phpt diff --git a/ext/standard/tests/file/basename_basic-win32.phpt b/ext/standard/tests/file/basename_basic-win32.phpt index ceccf9eef7..f575c5aa69 100644 --- a/ext/standard/tests/file/basename_basic-win32.phpt +++ b/ext/standard/tests/file/basename_basic-win32.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', diff --git a/ext/standard/tests/file/basename_basic.phpt b/ext/standard/tests/file/basename_basic.phpt index 6354b2acd7..68aefb2a3a 100644 --- a/ext/standard/tests/file/basename_basic.phpt +++ b/ext/standard/tests/file/basename_basic.phpt @@ -52,7 +52,7 @@ $file_paths = array ( /* path with spaces */ " ", ' ', - + /* empty paths */ "", '', 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/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt index 3a123029c0..53c53cf8b9 100644 --- a/ext/standard/tests/file/basename_error.phpt +++ b/ext/standard/tests/file/basename_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test basename() function : error conditions +Test basename() function : error conditions --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : error conditions ***\n"; diff --git a/ext/standard/tests/file/basename_variation1-win32.phpt b/ext/standard/tests/file/basename_variation1-win32.phpt index eb2a4ff497..0f4293e0b0 100644 --- a/ext/standard/tests/file/basename_variation1-win32.phpt +++ b/ext/standard/tests/file/basename_variation1-win32.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation1.phpt b/ext/standard/tests/file/basename_variation1.phpt index ea7cdfe8b7..93582389d4 100644 --- a/ext/standard/tests/file/basename_variation1.phpt +++ b/ext/standard/tests/file/basename_variation1.phpt @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php $prefixes = array ( - + // drive letters "A:/", "Z:/", @@ -31,7 +31,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", diff --git a/ext/standard/tests/file/basename_variation2-win32.phpt b/ext/standard/tests/file/basename_variation2-win32.phpt index 43d6de5060..5e9961b98f 100644 --- a/ext/standard/tests/file/basename_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_variation2-win32.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -35,13 +35,13 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt index 195b98a6d3..96cfd65057 100644 --- a/ext/standard/tests/file/basename_variation2.phpt +++ b/ext/standard/tests/file/basename_variation2.phpt @@ -13,7 +13,7 @@ $paths = array ( "foo", "foo/", - "foo\\", + "foo\\", "foo.bar", "foo.bar/", "foo.bar\\", @@ -35,13 +35,13 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { foreach ($suffixes as $suffix) { echo "basename for path $path, supplying suffix $suffix is:\n"; - var_dump(basename($path, $suffix)); + var_dump(basename($path, $suffix)); } } diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt index 684e538d76..f01f550a7d 100644 --- a/ext/standard/tests/file/basename_variation3.phpt +++ b/ext/standard/tests/file/basename_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test basename() function : first parameter type variations +Test basename() function : first parameter type variations --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt index 2bb94870df..88ce61a93d 100644 --- a/ext/standard/tests/file/basename_variation4.phpt +++ b/ext/standard/tests/file/basename_variation4.phpt @@ -3,9 +3,9 @@ Test basename() function : second parameter type variation --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing basename() : usage variation ***\n"; diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index abc6e47585..fcd85489f3 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -8,14 +8,14 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); $args = ' -n -dsafe_mode=off '; - + /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); echo "\n"; /* Binary Data Test */ - + if (substr(PHP_OS, 0, 3) != 'WIN') { $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; @@ -30,7 +30,7 @@ output_handler= } else { echo "Does not work\n"; } - + @unlink($tmpfile); ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt index 9fe4d2d9ee..9d0568af33 100644 --- a/ext/standard/tests/file/bug24482.phpt +++ b/ext/standard/tests/file/bug24482.phpt @@ -26,13 +26,13 @@ closedir($dh); if (count($dirs) != count($globdirs)) { echo "Directory count mismatch\n"; - + echo "glob found:\n"; - sort($globdirs); + sort($globdirs); var_dump($globdirs); - + echo "opendir/readdir/isdir found:\n"; - sort($dirs); + sort($dirs); var_dump($dirs); } else { echo "OK\n"; diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt index d1ad6b6526..a68d5728d7 100644 --- a/ext/standard/tests/file/bug26938.phpt +++ b/ext/standard/tests/file/bug26938.phpt @@ -6,14 +6,14 @@ $out = array(); $status = -1; $php = getenv('TEST_PHP_EXECUTABLE'); if (substr(PHP_OS, 0, 3) != 'WIN') { - exec($php . ' -n -r \'' + exec($php . ' -n -r \'' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' . ' print "\n";' . '}\'', $out, $status); } else { - exec($php . ' -n -r "' + exec($php . ' -n -r "' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index e342a17348..26959ec511 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -4,8 +4,8 @@ Bug #27508 (userspace wrappers have bogus eof indicator) <?php # vim:ft=php class FileStream { public $fp; - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { $url = urldecode(substr($path, 9)); $this->fp = fopen($url, $mode); @@ -13,22 +13,22 @@ class FileStream { return true; } - function stream_read($count) + function stream_read($count) { return fread($this->fp, $count); } - function stream_write($data) + function stream_write($data) { return fwrite($this->fp, $data); } - function stream_tell() + function stream_tell() { return ftell($this->fp); } - function stream_eof() + function stream_eof() { if (!$this->fp) { return true; @@ -36,7 +36,7 @@ class FileStream { return feof($this->fp); } - function stream_seek($offset, $whence) + function stream_seek($offset, $whence) { return fseek($this->fp, $offset, $whence) == 0 ? true : false; } diff --git a/ext/standard/tests/file/bug30362.phpt b/ext/standard/tests/file/bug30362.phpt index 59fe02ad06..1c2b4be979 100644 --- a/ext/standard/tests/file/bug30362.phpt +++ b/ext/standard/tests/file/bug30362.phpt @@ -11,7 +11,7 @@ for ($i = 0; ($i < 10) && !feof($resource); ++$i ) { echo $line . "\n"; } fclose($resource); - + ?> --EXPECT-- 111 diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 184dff264f..3526b24973 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -7,7 +7,7 @@ include (dirname(__FILE__)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: include(%s): failed to open stream: %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index fc14816f40..cc3ae14e4c 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -4,7 +4,7 @@ Bug #35781 (stream_filter_append() causes segfault) <?php $filename = dirname(__FILE__)."/bug35781.txt"; - + $fp = fopen($filename, "w"); stream_filter_append($fp, "string.rot13", -49); fwrite($fp, "This is a test\n"); @@ -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..783bf2227c 100644 --- a/ext/standard/tests/file/bug37158.phpt +++ b/ext/standard/tests/file/bug37158.phpt @@ -4,8 +4,8 @@ Bug #37158 (if userspace stream is present, fread() reads in 8192 max, otherwise <?php class VariableStream { - - function stream_open($path, $mode, $options, &$opened_path) + + function stream_open($path, $mode, $options, &$opened_path) { return true; } @@ -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'); @@ -33,7 +32,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "size of contents 1 = 20000" string(26) "size of contents 2 = 40960" Done diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt index 0544e06692..d92289ef6e 100644 --- a/ext/standard/tests/file/bug38086.phpt +++ b/ext/standard/tests/file/bug38086.phpt @@ -37,7 +37,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) string(134) "Nabgure qnl Jura gur cnvaf bs yvsr jba'g one zl jnl diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 6fd653de44..1de5d7f89b 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..e4f1af68f8 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 318a2a3eb9..64c9f8d94a 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index 0bcaeb2a89..a72a00310d 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--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 diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index 8cd8ca8a67..e03a2bf931 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..820664184f 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/bug40374.phpt b/ext/standard/tests/file/bug40374.phpt index c1f1bc5796..327289eba2 100644 --- a/ext/standard/tests/file/bug40374.phpt +++ b/ext/standard/tests/file/bug40374.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #40374 (php_shutdown_temporary_directory() tries to free local value) +Bug #40374 (php_shutdown_temporary_directory() tries to free local value) --FILE-- <?php @@ -12,6 +12,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(%d) "%s" Done diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt index ea074fa4fd..6c7ff5bf4b 100644 --- a/ext/standard/tests/file/bug41693.phpt +++ b/ext/standard/tests/file/bug41693.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41693 (scandir() allows empty directory names) +Bug #41693 (scandir() allows empty directory names) --FILE-- <?php @@ -7,7 +7,7 @@ var_dump(scandir('')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: scandir(): Directory name cannot be empty in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index 5411000fc1..5dbafac225 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 f35dfb6d54..aa6ed93f50 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 049db26588..34c55d4ceb 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/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt index ff49a554a4..0e414f2321 100644 --- a/ext/standard/tests/file/bug66509.phpt +++ b/ext/standard/tests/file/bug66509.phpt @@ -4,9 +4,9 @@ Bug #66509 (copy() showing $context parameter as required) <?php $r = new \ReflectionFunction('copy'); - + foreach($r->getParameters() as $p) { - var_dump($p->isOptional()); + var_dump($p->isOptional()); } ?> --EXPECT-- diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt index feb4eb9acd..a2abbb7f35 100644 --- a/ext/standard/tests/file/bug72035.phpt +++ b/ext/standard/tests/file/bug72035.phpt @@ -24,7 +24,7 @@ $cmd = "$cgi -n -C $fl"; $desc = array(0 => array("pipe", "r")); $proc = proc_open($cmd, $desc, $pipes, getcwd(), array()); if (is_resource($proc)) { - echo stream_get_contents($pipes[0]); + echo stream_get_contents($pipes[0]); proc_close($proc); } 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_error.phpt b/ext/standard/tests/file/chmod_error.phpt index 3b234c741f..f4cae3b5cf 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : error conditions +Test chmod() function : error conditions --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : error conditions ***\n"; diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index c7732a2926..f990b5b56b 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); @@ -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..9689852f51 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a relative path from a different working directory\n"; chdir($test_dirname); var_dump(chmod("../$filename", 0777)); @@ -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.phpt b/ext/standard/tests/file/chmod_variation2.phpt index c7a3db0fe7..b193acfaf7 100644 --- a/ext/standard/tests/file/chmod_variation2.phpt +++ b/ext/standard/tests/file/chmod_variation2.phpt @@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777)); var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755)); clearstatcache(); printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK); - + echo "\nchmod() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 13d2f1f667..7c637b8560 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : first parameter variation +Test chmod() function : first parameter variation --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index 08dbc7ab08..d5a691fa37 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test chmod() function : second parameter variation +Test chmod() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing chmod() : usage variation ***\n"; @@ -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_basic.phpt b/ext/standard/tests/file/copy_basic.phpt index d23a27839a..32788f9f74 100644 --- a/ext/standard/tests/file/copy_basic.phpt +++ b/ext/standard/tests/file/copy_basic.phpt @@ -7,7 +7,7 @@ Test copy() function: basic functionality * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: to copy file from source to destination --\n"; +echo "*** Testing copy() function: to copy file from source to destination --\n"; var_dump( file_exists(__FILE__) ); diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index ad723370e4..96072ebfba 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -7,7 +7,7 @@ Test copy() function: error conditions * Returns TRUE on success or FALSE on failure. */ -echo "*** Testing copy() function: error conditions --\n"; +echo "*** Testing copy() function: error conditions --\n"; /* Invalid args */ var_dump( copy("/no/file", "file") ); diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt index aa1584b98a..7cf20fd749 100644 --- a/ext/standard/tests/file/copy_variation1.phpt +++ b/ext/standard/tests/file/copy_variation1.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - destination file names(numerics/strings Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: In creation of destination file names containing numerics/strings +/* Test copy() function: In creation of destination file names containing numerics/strings and checking the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 1298cffc9a..b4aa19d1c2 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - identical names +Test copy() function: usage variations - identical names --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -17,8 +17,8 @@ $file_handle = fopen($file, "w"); fwrite($file_handle, str_repeat("Hello2world...\n", 100)); fclose($file_handle); -var_dump( copy($file, $file) ); -var_dump( file_exists($file) ); +var_dump( copy($file, $file) ); +var_dump( file_exists($file) ); var_dump( filesize($file) ); echo "*** Done ***\n"; @@ -29,7 +29,7 @@ echo "*** Done ***\n"; 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_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt index aabaa4cd4e..b01dab0890 100644 --- a/ext/standard/tests/file/copy_variation11.phpt +++ b/ext/standard/tests/file/copy_variation11.phpt @@ -28,7 +28,7 @@ var_dump( filesize($dir) ); //size of destination before copy clearstatcache(); echo "\n-- Now applying copy() operation --\n"; -var_dump( copy($file, $dir) ); //expected: bool(false) +var_dump( copy($file, $dir) ); //expected: bool(false) var_dump( file_exists($file) ); //expected: bool(true) var_dump( file_exists($dir) ); //expected: bool(true) diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 1c30d361a0..6eb8fe3ee4 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - non existing src/dest Returns TRUE on success or FALSE on failure. */ -/* Test copy(): Trying to create a copy of non-existing source in an existing destination +/* Test copy(): Trying to create a copy of non-existing source in an existing destination and an existing source in non-existing destiantion */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt index 546cbbb2f2..fdc84e989a 100644 --- a/ext/standard/tests/file/copy_variation15.phpt +++ b/ext/standard/tests/file/copy_variation15.phpt @@ -40,7 +40,7 @@ chmod($dir, 0555); //dir without write permissions $dest = $dir."/copy_copy_variation15.tmp"; -var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); +var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); var_dump( file_exists($dir."/copy_copy_variation15_dir.tmp") ); var_dump( filesize($file) ); //size of source diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index c2cb464a99..07a54075e1 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; @@ -131,7 +131,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_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt index 1ef9da1ae6..e36fee1d66 100644 --- a/ext/standard/tests/file/copy_variation16.phpt +++ b/ext/standard/tests/file/copy_variation16.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 73ccc71840..2dfe94c6e9 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -32,11 +32,11 @@ $dest_file_name = $dir."/copy_copy_variation17.tmp"; $count = 1; foreach($src_file_names as $src_file_name) { - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); var_dump( file_exists($dest_file_name) ); if( file_exists($dest_file_name) ) { - var_dump( filesize($dest_file_name) ); //size of destination + var_dump( filesize($dest_file_name) ); //size of destination unlink($dest_file_name); } diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 534902d7d4..564b34bf0c 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - stat after copy +Test copy() function: usage variations - stat after copy --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); @@ -27,13 +27,13 @@ $stat_before_copy = stat($src_file_name); clearstatcache(); echo "Copy operation => "; -var_dump( copy($src_file_name, $dest_file_name) ); +var_dump( copy($src_file_name, $dest_file_name) ); $stat_after_copy = stat($src_file_name); clearstatcache(); // compare all stat fields except access time -$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", +$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "mtime", "ctime", "blksize", "blocks"); @@ -49,7 +49,7 @@ 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_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt index cb7c96fa0b..95688c97c5 100644 --- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; +$src_file_name = $file_path."/copy_variation2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt index 029c6c5f8e..82235ba814 100644 --- a/ext/standard/tests/file/copy_variation2-win32.phpt +++ b/ext/standard/tests/file/copy_variation2-win32.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt index 681a00750c..a9b36803d9 100644 --- a/ext/standard/tests/file/copy_variation2.phpt +++ b/ext/standard/tests/file/copy_variation2.phpt @@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") echo "*** Test copy() function: destination file names containing special characters ***\n"; $file_path = dirname(__FILE__); -$src_file_name = $file_path."/copy_variation2.tmp"; +$src_file_name = $file_path."/copy_variation2.tmp"; $file_handle = fopen($src_file_name, "w"); fwrite( $file_handle, str_repeat("Hello2World...\n", 100) ); fclose($file_handle); @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* File names containing special(non-alpha numeric) characters */ - "_copy_variation2.tmp", + "_copy_variation2.tmp", "@copy_variation2.tmp", "#copy_variation2.tmp", "+copy_variation2.tmp", diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 259412f460..5055c297f6 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 3bc0bfd139..181da9a5f9 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; @@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) { echo "\n-- Iteration $count --\n"; $dest_file_name = $dest_file; - + echo "Copy operation => "; - var_dump( copy($src_file_name, $dest_file_name) ); + var_dump( copy($src_file_name, $dest_file_name) ); echo "Existence of destination file => "; var_dump( file_exists($dest_file_name) ); @@ -75,7 +75,7 @@ echo "*** Done ***\n"; 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_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt Binary files differindex f856d1665a..47152d4239 100644 --- a/ext/standard/tests/file/copy_variation4.phpt +++ b/ext/standard/tests/file/copy_variation4.phpt diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index 1245191806..48e85eaf02 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ @@ -27,7 +27,7 @@ fclose($file_handle); $dest_files = array( /* Checking case sensitiveness */ - "COPY.tmp", + "COPY.tmp", "COPY.TMP", "CopY.TMP" ); diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index df13f4bd1a..c480fcc3bf 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -12,7 +12,7 @@ if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) ) Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 9d4fb9d9c9..524b21d377 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt index 2ce9bb3072..3213c6b436 100644 --- a/ext/standard/tests/file/copy_variation6.phpt +++ b/ext/standard/tests/file/copy_variation6.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 52ad6892ae..805fa9dd13 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Trying to copy the links across dir paths given in various notations +/* Trying to copy the links across dir paths given in various notations and dirs having limited access */ echo "*** Testing copy() function: copying links across different directories ***\n"; @@ -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/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index e2817aaef3..34d5b907d9 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - destination file access perms +Test copy() function: usage variations - destination file access perms --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN') diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt index 1e7f016e7f..87f85230b5 100644 --- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt +++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test function fstat() on directory wrapper +Test function fstat() on directory wrapper --FILE-- <?php $d = dirname(__FILE__); diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index ed59582b1b..f3b3902b0d 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/', + '/usr/', ); foreach ($paths as $path) { @@ -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 1934e8ed0d..ba131d1662 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : basic functionality ***\n"; @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/' + '/usr/' ); foreach ($paths as $path) { @@ -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_error.phpt b/ext/standard/tests/file/dirname_error.phpt index 4181823b92..515a3988d5 100644 --- a/ext/standard/tests/file/dirname_error.phpt +++ b/ext/standard/tests/file/dirname_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test dirname() function : error conditions +Test dirname() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : error conditions ***\n"; diff --git a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt index 2bb227b5c2..283834e8ce 100644 --- a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt +++ b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt @@ -19,7 +19,7 @@ if (strlen($s) >= 10000) { print "ERROR: " . PHP_EOL; var_dump(dirname($s)); var_dump(strlen($s)); -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index fd7aec1210..15041ffd53 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test dirname() function : usage variation +Test dirname() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing dirname() : usage variation ***\n"; diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt index a048af6ccb..6eef4b4a77 100644 --- a/ext/standard/tests/file/disk.phpt +++ b/ext/standard/tests/file/disk.phpt @@ -25,7 +25,7 @@ var_dump(disk_total_space("/some/path/here")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 9dbbea4e31..57446b6ee0 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -10,23 +10,23 @@ memory_limit=32M <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function - * will return the number of bytes available on the corresponding + * Description: Given a string containing a directory, this function + * will return the number of bytes available on the corresponding * filesystem or disk partition */ $file_path = dirname(__FILE__); echo "*** Testing with existing directory ***\n"; -var_dump( disk_free_space($file_path) ); -var_dump( diskfreespace($file_path) ); +var_dump( disk_free_space($file_path) ); +var_dump( diskfreespace($file_path) ); echo "*** Testing with newly created directory ***\n"; $dir = "/disk_free_space"; mkdir($file_path.$dir); echo" \n Free Space before writing to a file\n"; -$space1 = disk_free_space($file_path.$dir); -var_dump( $space1 ); +$space1 = disk_free_space($file_path.$dir); +var_dump( $space1 ); $fh = fopen($file_path.$dir."/disk_free_space.tmp", "a"); $data = str_repeat("x", 0xffff); @@ -34,8 +34,8 @@ fwrite($fh, $data); fclose($fh); echo "\n Free Space after writing to a file\n"; -$space2 = disk_free_space($file_path.$dir); -var_dump( $space2 ); +$space2 = disk_free_space($file_path.$dir); +var_dump( $space2 ); if($space1 > $space2 ) echo "\n Free Space Value Is Correct\n"; @@ -45,7 +45,7 @@ else { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_free_space(b"$file_path") ); +var_dump( disk_free_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt index 27a1c0def6..21e7bf653d 100644 --- a/ext/standard/tests/file/disk_free_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * Prototype: float disk_free_space( string directory ) * Description: Given a string containing a directory, this function will - * return the number of bytes available on the corresponding + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index a62954c74f..ab2ad09081 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function will - * return the number of bytes available on the corresponding + * Description: Given a string containing a directory, this function will + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index e59079eac0..adb1acaf82 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -4,7 +4,7 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function + * Description: Given a string containing a directory, this function * will return the number of bytes available on the corresponding * filesystem or disk partition */ @@ -12,11 +12,11 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_free_space($file_path."/..") ); -var_dump( diskfreespace($file_path."/..") ); +var_dump( disk_free_space($file_path."/..") ); +var_dump( diskfreespace($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_free_space($file_path); +$return_value = disk_free_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt index b2cb79edfd..cfef2a4245 100644 --- a/ext/standard/tests/file/disk_total_space_basic.phpt +++ b/ext/standard/tests/file/disk_total_space_basic.phpt @@ -4,7 +4,7 @@ Test disk_total_space() function : basic functionality <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function will + * Description: given a string containing a directory, this function will * return the total number of bytes on the corresponding filesyatem * or disk partition. */ diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt index 3fe54b5320..a3ea183194 100644 --- a/ext/standard/tests/file/disk_total_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * Prototype: float disk_total_space( string $directory ); * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt index de37851d26..b60ad6048f 100644 --- a/ext/standard/tests/file/disk_total_space_error.phpt +++ b/ext/standard/tests/file/disk_total_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index 4e94774a74..ba2ceb2d1b 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -4,18 +4,18 @@ Testing disk_total_space() functions : Usage Variations. <?php /* * Prototype: float disk_total_space( string directory ) - * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition. */ $file_path = dirname(__FILE__); echo "*** Testing with a directory ***\n"; -var_dump( disk_total_space($file_path."/..") ); +var_dump( disk_total_space($file_path."/..") ); echo "\nTesting for the return type ***\n"; -$return_value = disk_total_space($file_path); +$return_value = disk_total_space($file_path); var_dump( is_float($return_value) ); echo "\n*** Testing with different directory combinations ***"; @@ -54,7 +54,7 @@ foreach($dirs_arr as $dir1) { } echo "*** Testing with Binary Input ***\n"; -var_dump( disk_total_space(b"$file_path") ); +var_dump( disk_total_space(b"$file_path") ); echo"\n--- Done ---"; ?> diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt index 2fc2e4b855..78774e58e9 100644 --- a/ext/standard/tests/file/feof_basic.phpt +++ b/ext/standard/tests/file/feof_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test feof() function : basic functionality +Test feof() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool feof(resource fp) - * Description: Test for end-of-file on a file pointer + * Description: Test for end-of-file on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzeof */ @@ -31,7 +31,7 @@ while (!feof($h)) { $lastline = fgets($h); } echo $previousLine; -var_dump($lastline); // this should be false +var_dump($lastline); // this should be false fclose($h); $tmpFile2 = __FILE__.".tmp2"; diff --git a/ext/standard/tests/file/fflush_basic.phpt b/ext/standard/tests/file/fflush_basic.phpt index f375c4f079..962c774637 100644 --- a/ext/standard/tests/file/fflush_basic.phpt +++ b/ext/standard/tests/file/fflush_basic.phpt @@ -44,7 +44,7 @@ $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 8cf9981b34..79a5bc1ca5 100644 --- a/ext/standard/tests/file/fflush_error.phpt +++ b/ext/standard/tests/file/fflush_error.phpt @@ -21,7 +21,7 @@ $filename = "$file_path/fflush_error.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + var_dump( fflush($file_handle, $file_handle) ); fclose($file_handle); @@ -67,7 +67,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 -- @@ -75,7 +75,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 a085e47a52..12c34cb2f5 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variationç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™1.tmp"; +$file_name = "$file_path/fflush_variationç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); @@ -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_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index b0e85fea17..109e531b95 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,26 +31,26 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + // filling the file some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); @@ -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_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 7c91a7a23d..4b77195a0e 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t", "a", "ab", "at", "a+","a+b", "a+t", "x", "xb", "xt", "x+", "x+b", "x+t"); -$file_name = "$file_path/fflush_variation1.tmp"; +$file_name = "$file_path/fflush_variation1.tmp"; $count = 1; @@ -31,7 +31,7 @@ foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type Data--\n"; foreach( $file_modes as $mode ) { echo "-- File opened in $mode mode --\n"; - + // creating the file except for x mode if( substr($mode, 0, 1) != "x" ) { $file_handle = fopen($file_name, "w"); @@ -39,19 +39,19 @@ foreach( $file_types as $type ) { exit("Error:failed to open file $file_name"); // filling the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a") + if( substr($mode, 0, 1) == "a") fill_file($file_handle, $type, 10); fclose($file_handle); - } - - // opening the file in different modes + } + + // opening the file in different modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); @@ -64,7 +64,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 2b28367b00..9dfa17c43c 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -35,14 +35,14 @@ foreach( $file_types as $type ) { $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - + //fill the file with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); - + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); + //close the file fclose($file_handle); - + // creating the sym link var_dump( symlink($file_name, $symlink_name) ); $file_handle = fopen($symlink_name, $mode); @@ -50,10 +50,10 @@ foreach( $file_types as $type ) { exit("Error:failed to open link $symlink_name"); // filling data into the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); - + // reading the data from the file var_dump( readfile($symlink_name) ); @@ -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 73f27eae31..0f27413930 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -29,28 +29,28 @@ $count = 1; foreach( $file_types as $type ) { echo "-- Iteration $count with file containing $type data --\n"; foreach( $file_modes as $mode ) { - + // creating the file $file_handle = fopen($file_name, "w"); if($file_handle == false) exit("Error:failed to open file $file_name"); - // fill the fill with some data if mode is append mode - if( substr($mode, 0, 1) == "a" ) - fill_file($file_handle, $type, 10); + // fill the fill with some data if mode is append mode + if( substr($mode, 0, 1) == "a" ) + fill_file($file_handle, $type, 10); // fclose($file_handle); - + // creating hard link to the file var_dump( link($file_name, $link_name) ); - + // opening the file in different modes $file_handle = fopen($link_name, $mode); if($file_handle == false) exit("Error:failed to open link $link_name"); - + // writing data to the file - var_dump( fill_file($file_handle, $type, 50) ); + var_dump( fill_file($file_handle, $type, 50) ); var_dump( fflush($file_handle) ); fclose($file_handle); @@ -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 29faeab3cb..ce6536ae2f 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fflush() function: usage variations - file opened in read-only mode +Test fflush() function: usage variations - file opened in read-only mode --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); @@ -14,7 +14,7 @@ require $file_path.'/file.inc'; echo "*** Testing fflush(): with file handles of files opened in various read modes ***\n"; $file_modes = array("r", "rb", "rt"); -$file_name = "$file_path/fflush_variation4.tmp"; +$file_name = "$file_path/fflush_variation4.tmp"; $count = 1; @@ -26,21 +26,21 @@ foreach( $file_modes as $mode ) { if($file_handle == false) exit("Error:failed to open file $file_name"); fclose($file_handle); - + // opening the file in different read modes $file_handle = fopen($file_name, $mode); - if($file_handle == false) + if($file_handle == false) exit("Error:failed to open file $file_name"); var_dump( fflush($file_handle) ); fclose($file_handle); - + unlink($file_name); $count++; } 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_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 01f01f2361..7851e432f3 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -6,7 +6,7 @@ Test fgetc() function : basic functionality Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : basic operations ***\n"; @@ -20,9 +20,9 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo "--- Outerloop iteration "; echo $outerloop_counter + 1; echo " ---\n"; - // create file file + // create file file create_files(dirname(__FILE__), 1, $file_content_types[$outerloop_counter], 0755, 1, "w", "fgetc_basic", 1); - + //open the file in different modes and check the working of fgetc for($innerloop_counter = 0; $innerloop_counter < count($file_modes); $innerloop_counter++) { echo "-- Innerloop iteration "; @@ -30,7 +30,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo " of Outerloop Iteration "; echo $outerloop_counter + 1; echo " --\n"; - + // open the file using the $file_modes $filename = dirname(__FILE__)."/fgetc_basic1.tmp"; // file name that is created by create_files echo "-- Testing fgetc() : file opened using $file_modes[$innerloop_counter] mode --\n"; @@ -40,20 +40,20 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou exit(); } - // perform the read file at least 6 char and check + // perform the read file at least 6 char and check for( $counter = 1; $counter <= 6; $counter++ ) { // read data from the file and check, file pointer position, feof etc var_dump( fgetc($file_handle) ); // read a char var_dump( ftell($file_handle) ); // file pointer position var_dump( feof($file_handle) ); // is it eof() - var_dump($file_handle); // dump the $file_handle to see if any thing got modifed + var_dump($file_handle); // dump the $file_handle to see if any thing got modifed } // end of for - - // close the file + + // close the file fclose ( $file_handle); } // end of innerloop for - + // delete the file delete_files(dirname(__FILE__), 1, "fgetc_basic", 1, ".tmp"); 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..c86241a976 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -6,12 +6,12 @@ Test fgetc() function : usage variations - read when file pointer at EOF Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with file whose file pointer is pointing to EOF --\n"; -// create a file +// create a file create_files(dirname(__FILE__), 1, "text_with_new_line", 0755, 1, "w", "fgetc_variation"); $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; @@ -20,9 +20,9 @@ $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; $file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t"); $loop_counter =0; for(; $loop_counter < count($file_modes); $loop_counter++) { - // print the hearder + // print the hearder echo "-- File opened in mode : $file_modes[$loop_counter] --\n"; - // open the file + // open the file $file_handle = fopen ($filename, $file_modes[$loop_counter]); if (!$file_handle) { echo "Error: failed to open file $filename! \n"; @@ -33,11 +33,11 @@ for(; $loop_counter < count($file_modes); $loop_counter++) { var_dump( fseek($file_handle, 0, SEEK_END) ); // set file pointer to eof var_dump( feof($file_handle) ); // expected false var_dump( ftell($file_handle) ); // ensure that file pointer is at eof - var_dump( fgetc($file_handle) ); // try n read a char, none expected + var_dump( fgetc($file_handle) ); // try n read a char, none expected var_dump( feof($file_handle) ); // ensure that file pointer is at eof var_dump( ftell($file_handle) ); // file pointer position - // close the file handle + // close the file handle fclose($file_handle); } echo "Done\n"; @@ -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_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt index d444209af4..169f00ac2c 100644 --- a/ext/standard/tests/file/fgetc_variation2.phpt +++ b/ext/standard/tests/file/fgetc_variation2.phpt @@ -11,8 +11,8 @@ Test fgetc() function : usage variations - closed handle - closed file handle - unset file handle */ - -// include the header for common test function + +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 0d795688ad..fcea7f0d86 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -12,7 +12,7 @@ Test fgetc() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() with file opened in write only mode ***\n"; @@ -31,8 +31,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -44,12 +44,12 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } 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 717e78010b..7c4ea4fa0f 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetc() function : usage variations - different read modes +Test fgetc() function : usage variations - different read modes --FILE-- <?php /* @@ -13,8 +13,8 @@ Test fgetc() function : usage variations - different read modes echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with files opened with different read modes --\n"; -$file_modes = array( "a+", "a+b", "a+t", - "x+", "x+b", "x+t", +$file_modes = array( "a+", "a+b", "a+t", + "x+", "x+b", "x+t", "w+", "w+b", "w+t" ); $filename = dirname(__FILE__)."/fgetc_variation4.tmp"; @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file, at least 7 chars @@ -45,12 +45,12 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } 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/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt index 5fc8108a62..969c9c0348 100644 --- a/ext/standard/tests/file/fgetcsv_variation1.phpt +++ b/ext/standard/tests/file/fgetcsv_variation1.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with all parameters specified echo "*** Testing fgetcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation1.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,22 +67,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with max length + + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt index 41388fb00c..60a401bb86 100644 --- a/ext/standard/tests/file/fgetcsv_variation10.phpt +++ b/ext/standard/tests/file/fgetcsv_variation10.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - file pointer pointing to EOF +Test fgetcsv() : usage variations - file pointer pointing to EOF --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,7 +11,7 @@ Test fgetcsv() : usage variations - file pointer pointing to EOF echo "*** Testing fgetcsv() : with file pointer pointing to EOF ***\n"; -/* the array is with three elements in it. Each element should be read as +/* the array is with three elements in it. Each element should be read as 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation10.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,34 +58,34 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - // set the file pointer to EOF - var_dump( fseek($file_handle, 0, SEEK_END) ); + // set the file pointer to EOF + var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); // with default args + var_dump( fgetcsv($file_handle) ); // with default args // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt index c555cf532a..d5741248fb 100644 --- a/ext/standard/tests/file/fgetcsv_variation11.phpt +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt @@ -2,18 +2,18 @@ Test fgetcsv() : usage variations - with different enclosure but same delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() by reading from a file when different enclosure that is not +/* Testing fgetcsv() by reading from a file when different enclosure that is not present in the data being read and delimiter which is present in the data */ echo "*** Testing fgetcsv() : with different enclosure but same delimiter char ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,7 +33,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation11.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt index 6ae6ae61b1..3168684468 100644 --- a/ext/standard/tests/file/fgetcsv_variation12.phpt +++ b/ext/standard/tests/file/fgetcsv_variation12.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) +Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -49,7 +49,7 @@ foreach ($csv_lists as $csv_list) { $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; fwrite($file_handle, $csv_field . "\n"); - + // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its // working when only a blank line is read @@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -78,12 +78,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt index b7c7b6b373..f191a26379 100644 --- a/ext/standard/tests/file/fgetcsv_variation13.phpt +++ b/ext/standard/tests/file/fgetcsv_variation13.phpt @@ -3,7 +3,7 @@ Test fgetcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -19,7 +19,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation13.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -37,7 +37,7 @@ $loop_counter = 1; fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -45,10 +45,10 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - - + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle) ); @@ -60,7 +60,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt index 44eb066e9c..14c72a24b1 100644 --- a/ext/standard/tests/file/fgetcsv_variation14.phpt +++ b/ext/standard/tests/file/fgetcsv_variation14.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - reading the blank line +Test fgetcsv() : usage variations - reading the blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -18,7 +18,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation14.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -36,7 +36,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -44,8 +44,8 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -65,7 +65,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt index 212f197745..c6859497ee 100644 --- a/ext/standard/tests/file/fgetcsv_variation15.phpt +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default enclosure echo "*** Testing fgetcsv() : with default enclosure ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -28,7 +28,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation15.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -61,8 +61,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt index 4768cf2770..9cfdd72460 100644 --- a/ext/standard/tests/file/fgetcsv_variation16.phpt +++ b/ext/standard/tests/file/fgetcsv_variation16.phpt @@ -2,19 +2,19 @@ Test fgetcsv() : usage variations - with default enclosure & length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character - and length value equal to zero +/* Testing fgetcsv() to read a file when provided with default enclosure character + and length value equal to zero */ echo "*** Testing fgetcsv() : with default enclosure & length as 0 ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation16.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,14 +63,14 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); - var_dump( fgetcsv($file_handle, 0, $delimiter) ); + var_dump( fgetcsv($file_handle, 0, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt index 75cb1c5ced..b8d918659f 100644 --- a/ext/standard/tests/file/fgetcsv_variation17.phpt +++ b/ext/standard/tests/file/fgetcsv_variation17.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure & length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -13,8 +13,8 @@ Test fgetcsv() : usage variations - with default enclosure & length less than li echo "*** Testing fgetcsv() : with default enclosure & length less than line size ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation17.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,29 +63,29 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - // read rest of the line + // read rest of the line var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt index a5889ee77d..f0ebcb7fae 100644 --- a/ext/standard/tests/file/fgetcsv_variation18.phpt +++ b/ext/standard/tests/file/fgetcsv_variation18.phpt @@ -2,19 +2,19 @@ Test fgetcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character +/* Testing fgetcsv() to read a file when provided with default enclosure character and with delimiter character which is not in the line being read by fgetcsv() */ echo "*** Testing fgetcsv() : with default enclosure and different delimiter ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation18.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -63,24 +63,24 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use different delimiter than existing in file + + // use different delimiter than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; var_dump( fgetcsv($file_handle, 1024, $del) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt index 5200b5e8e1..cb510099bd 100644 --- a/ext/standard/tests/file/fgetcsv_variation19.phpt +++ b/ext/standard/tests/file/fgetcsv_variation19.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read a file when provided with default enclosure character - and with delimiter of two characters + Testing fgetcsv() to read a file when provided with default enclosure character + and with delimiter of two characters */ echo "*** Testing fgetcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation19.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -64,24 +64,24 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use delimiter & enclosure char of two chars + + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; var_dump( fgetcsv($file_handle, 1024, $del) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt index 40fb910cf9..d1e446d1f9 100644 --- a/ext/standard/tests/file/fgetcsv_variation2.phpt +++ b/ext/standard/tests/file/fgetcsv_variation2.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - with length as 0 +Test fgetcsv() : usage variations - with length as 0 --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with length as 0 echo "*** Testing fgetcsv() : with length as 0 ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation2.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use length as 0 + + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt index 5027d13a78..70bd8acbb0 100644 --- a/ext/standard/tests/file/fgetcsv_variation20.phpt +++ b/ext/standard/tests/file/fgetcsv_variation20.phpt @@ -2,16 +2,16 @@ Test fgetcsv() : usage variations - with default enclosure, line without any csv fields --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read a line without any csv fields from a file when provided with default enclosure value */ - + echo "*** Testing fgetcsv() : with default enclosure, line without any csv fields ***\n"; $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -34,11 +34,11 @@ $loop_counter = 1; echo "Error: failed to create file $filename!\n"; exit(); } - // write line of text + // write line of text fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is without csv fields, provide delimiter and see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024) ); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt index 6acbbf4f88..ae8c4f1ef6 100644 --- a/ext/standard/tests/file/fgetcsv_variation21.phpt +++ b/ext/standard/tests/file/fgetcsv_variation21.phpt @@ -2,13 +2,13 @@ Test fgetcsv() : usage variations - with default enclosure, blank line --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read a file containing blank line when provided with + Testing fgetcsv() to read a file containing blank line when provided with default enclosure argument */ @@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation21.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { @@ -38,7 +38,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -46,11 +46,11 @@ $loop_counter = 1; // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // read the line which is a blank line to see the working of fgetcsv $fp_pos = ftell($file_handle); var_dump( fgetcsv($file_handle, 1024, '+') ); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt index ed4e129eb5..9f35c1c1c3 100644 --- a/ext/standard/tests/file/fgetcsv_variation22.phpt +++ b/ext/standard/tests/file/fgetcsv_variation22.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointin echo "*** Testing fgetcsv() : with default enclosure, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation22.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation23.phpt b/ext/standard/tests/file/fgetcsv_variation23.phpt index a9b51f06a5..b766f1e062 100644 --- a/ext/standard/tests/file/fgetcsv_variation23.phpt +++ b/ext/standard/tests/file/fgetcsv_variation23.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - empty file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -12,7 +12,7 @@ Test fgetcsv() : usage variations - empty file echo "*** Testing fgetcsv() : reading from file which is having zero content ***\n"; // try reading from file which is having zero content -// create the file and then open in read mode and try reading +// create the file and then open in read mode and try reading $filename = dirname(__FILE__) . '/fgetcsv_variation23.tmp'; $fp = fopen ($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt index 154c6f9104..cdfadceb70 100644 --- a/ext/standard/tests/file/fgetcsv_variation24.phpt +++ b/ext/standard/tests/file/fgetcsv_variation24.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various write modes) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read from a file opened in various write modes and + Testing fgetcsv() to read from a file opened in various write modes and enclosure argument with two characters */ echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -80,12 +80,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt index 9ba0aa15ed..52e830cb5b 100644 --- a/ext/standard/tests/file/fgetcsv_variation25.phpt +++ b/ext/standard/tests/file/fgetcsv_variation25.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with enclosure and delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation25.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt index 53077f3372..c042eb4931 100644 --- a/ext/standard/tests/file/fgetcsv_variation26.phpt +++ b/ext/standard/tests/file/fgetcsv_variation26.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug #42036) --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug echo "*** Testing fgetcsv() : reading the files opened in write only mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -38,7 +38,7 @@ foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { // create the file and add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); - + if ( !$file_handle ) { echo "Error: failed to create file $filename!\n"; exit(); @@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -56,22 +56,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with max length + + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt index ff10286b4c..a215e90a3f 100644 --- a/ext/standard/tests/file/fgetcsv_variation27.phpt +++ b/ext/standard/tests/file/fgetcsv_variation27.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with delimiter and no enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and no enclosure arguments */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation27.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt index 4facbcf1ea..4e6fed3171 100644 --- a/ext/standard/tests/file/fgetcsv_variation28.phpt +++ b/ext/standard/tests/file/fgetcsv_variation28.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with negative length value along with neither enclosure and nor delimiter --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* - Testing fgetcsv() to read from a file when provided with negative length argument +/* + Testing fgetcsv() to read from a file when provided with negative length argument along with neither delimiter nor enclosure argument */ - + echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation28.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + fwrite($file_handle, $csv_field . "\n"); // write another line of text and a blank line // this will be used to test, if the fgetcsv() read more than a line and its @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - - // use the right delimiter and enclosure with negative length + + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt index df4ee6c6f5..0420860321 100644 --- a/ext/standard/tests/file/fgetcsv_variation29.phpt +++ b/ext/standard/tests/file/fgetcsv_variation29.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with only file handle as argument, file poin echo "*** Testing fgetcsv() : with file handle as only argument and file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation29.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -57,22 +57,22 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); + var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt index 20507973db..8cde39da20 100644 --- a/ext/standard/tests/file/fgetcsv_variation3.phpt +++ b/ext/standard/tests/file/fgetcsv_variation3.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with delimiter as NULL echo "*** Testing fgetcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation3.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 1024, NULL, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation30.phpt b/ext/standard/tests/file/fgetcsv_variation30.phpt index 2cb570c8dc..e474b2d546 100644 --- a/ext/standard/tests/file/fgetcsv_variation30.phpt +++ b/ext/standard/tests/file/fgetcsv_variation30.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer po echo "*** Testing fgetcsv() : with file handle and length arguments, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation30.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) { if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024) ); + var_dump( fgetcsv($file_handle, 1024) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt index d4e3d8a43d..7d1e90e1f9 100644 --- a/ext/standard/tests/file/fgetcsv_variation31.phpt +++ b/ext/standard/tests/file/fgetcsv_variation31.phpt @@ -1,8 +1,8 @@ --TEST-- -Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file +Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with length and enclosure, file pointer poin echo "*** Testing fgetcsv() : with enclosure argument, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation31.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -57,23 +57,23 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); - } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + } + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); - + // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); $enc = 'z'; - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -81,7 +81,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt index e42163bd98..da945daa70 100644 --- a/ext/standard/tests/file/fgetcsv_variation4.phpt +++ b/ext/standard/tests/file/fgetcsv_variation4.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with enclosure as NULL echo "*** Testing fgetcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation4.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, NULL) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt index ff18d6fe13..d3564e4015 100644 --- a/ext/standard/tests/file/fgetcsv_variation5.phpt +++ b/ext/standard/tests/file/fgetcsv_variation5.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with delimiter & enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ /* - Testing fgetcsv() to read from a file when provided with delimiter and + Testing fgetcsv() to read from a file when provided with delimiter and enclosure values both as NULL */ echo "*** Testing fgetcsv() : with delimiter & enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation5.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,8 +69,8 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields @@ -84,7 +84,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt index 95db326598..844dd7c519 100644 --- a/ext/standard/tests/file/fgetcsv_variation6.phpt +++ b/ext/standard/tests/file/fgetcsv_variation6.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with length less than line size --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with the length argument value less than the line size */ echo "*** Testing fgetcsv() : with length less than line size ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation6.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,12 +69,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -90,7 +90,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt index 2854dc766f..271a55b009 100644 --- a/ext/standard/tests/file/fgetcsv_variation7.phpt +++ b/ext/standard/tests/file/fgetcsv_variation7.phpt @@ -2,7 +2,7 @@ Test fgetcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default arguments value echo "*** Testing fgetcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation7.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use only default arguments + // use only default arguments fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt index cd518cb144..bf06d29b40 100644 --- a/ext/standard/tests/file/fgetcsv_variation8.phpt +++ b/ext/standard/tests/file/fgetcsv_variation8.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when provided with values of delimiter and enclosure that are not present in the line read by fgetcsv() */ echo "*** Testing fgetcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation8.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,12 +70,12 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - // use different delimiter and enclosure than existing in file + // use different delimiter and enclosure than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; $enc = "%"; @@ -83,12 +83,12 @@ foreach ($csv_lists as $csv_list) { // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // close the file fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt index dd0d788f6c..294241e6cd 100644 --- a/ext/standard/tests/file/fgetcsv_variation9.phpt +++ b/ext/standard/tests/file/fgetcsv_variation9.phpt @@ -2,20 +2,20 @@ Test fgetcsv() : usage variations - with different delimiter but same enclosure --FILE-- <?php -/* +/* Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] ); Description: Gets line from file pointer and parse for CSV fields */ -/* +/* Testing fgetcsv() to read from a file when the delimiter argument value is not present in the line being read by the fgetcsv() */ echo "*** Testing fgetcsv() : with different delimiter but same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation9.tmp'; $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,11 +69,11 @@ foreach ($csv_lists as $csv_list) { // rewind the file pointer to bof rewind($file_handle); } - - echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; + + echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; // call fgetcsv() to parse csv fields - + // use different delimiter but same enclosure char fseek($file_handle, 0, SEEK_SET); $del = "+"; @@ -86,7 +86,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 90515577c4..60a57a8dae 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { } echo "-- fgets() with default length, file pointer at 0 --\n"; - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set @@ -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 f139d33294..c84d562027 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -17,13 +17,13 @@ echo "-- Testing fgets() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgets($fp, 10, $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgets() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fgets($fp, $len) ); $len = -10; var_dump( fgets($fp, $len) ); -$len = 1; +$len = 1; var_dump( fgets($fp, $len) ); // return length - 1 always, expect false @@ -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..a51ca6c81c 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -11,7 +11,7 @@ Test fgets() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() with file opened in write only mode ***\n"; @@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) { fwrite($file_handle, $data); // rewind the file pointer to beginning of the file - var_dump( rewind($file_handle) ); - var_dump( ftell($file_handle) ); + var_dump( rewind($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); // read from file @@ -43,12 +43,12 @@ foreach ($file_modes as $file_mode ) { fclose($file_handle); // delete the file - unlink($filename); + unlink($filename); } 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_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index fcd85ce6e0..201755b69c 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -11,8 +11,8 @@ Test fgets() function : usage variations - closed handle - closed file handle - unset file handle */ - -// include the header for common test function + +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index 655e25523b..09b20fcb23 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { /* create files with $file_content_type */ $file_handle = fopen($filename, $file_mode); $data = fill_file($file_handle, $file_content_type, 50); - + if ( !$file_handle ) { echo "Error: failed to open file $filename!"; exit(); @@ -40,7 +40,7 @@ foreach($file_modes as $file_mode) { rewind($file_handle); var_dump( ftell($file_handle) ); - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set @@ -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..40223d3cdf 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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..c95ca287bd 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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 0c678c257d..1843c2e8b5 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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 261db1d12c..1907f541e2 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -12,7 +12,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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..fa01154bcf 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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 dba2b76ca7..52da7094dd 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -18,7 +18,7 @@ include ("file.inc"); $file_modes = array("w+", "w+b", "w+t", "a+", "a+b", "a+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric"); @@ -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..fc685113fc 100644 --- a/ext/standard/tests/file/fgetss.phpt +++ b/ext/standard/tests/file/fgetss.phpt @@ -38,46 +38,107 @@ var_dump(fgetss($fp, 0)); echo "Done\n"; ?> ---EXPECTF-- +--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..5054086d7d 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..53ef38d4d8 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 @@ -9,7 +11,7 @@ Test fgetss() function : Basic functionality - read modes only /* test fgetss with all read modes */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : Basic operations ***\n"; @@ -32,33 +34,33 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "\n-- Testing fgetss() with file opened using $file_modes[$mode_counter] mode --\n"; /* create an empty file and write the strings with tags */ - $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; + $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; exit(); } - - rewind($file_handle); - /* read entire file and strip tags */ + + rewind($file_handle); + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 --\n"; var_dump( fgetss($file_handle) ); // no length and allowable tags provided, reads entire file var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + rewind($file_handle); /* read entire file and strip tags tags */ echo "-- fgets() with length = 30, file pointer at 0 --\n"; var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 3a3fbb09ab..c875024718 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 @@ -32,7 +34,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,17 +68,17 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - 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..c7f3aa4c06 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 @@ -32,7 +34,7 @@ EOT; if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -47,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -66,17 +68,17 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - 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..771eabeaa1 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 @@ -30,7 +32,7 @@ is a heredoc string. <pg>ksklnm@@$$&$&^%&^%&^%&</pg> <html> html </html> <?php echo "php"; ?> EOT; -$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; +$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -45,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); @@ -64,17 +66,17 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - 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..893aca221a 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 @@ -17,14 +19,14 @@ echo "-- Testing fgetss() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgetss($fp, 100, '<p><a>', $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgetss() with invalid length arguments --\n"; -$len = 0; +$len = 0; $allowable_tags = '<p><a>'; var_dump( fgetss($fp, $len, $allowable_tags) ); $len = -10; var_dump( fgetss($fp, $len, $allowable_tags) ); -$len = 1; +$len = 1; var_dump( fgetss($fp, $len, $allowable_tags) ); // return length - 1 always, expect false // test invalid arguments : non-resources @@ -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..688f5e624a 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 @@ -19,7 +21,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -55,23 +57,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 54826fad66..c716090541 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 @@ -19,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -51,29 +53,29 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - /* read entire file and strip tags */ + /* read entire file and strip tags */ echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n"; var_dump( fgetss($file_handle) ); // expected : no character should be read var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file delete_file($filename); } // end of for - 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..e8d168e46f 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -2,12 +2,14 @@ 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 */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); /*Test fgetss() with all read modes , reading line by line with allowable tags: <test>, <html>, <?> */ @@ -27,7 +29,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -37,7 +39,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -49,7 +51,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + /* rewind the file and read the file line by line with allowable tags */ echo "-- Reading line by line with allowable tags: <test>, <html>, <?> --\n"; rewind($file_handle); @@ -60,16 +62,16 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - 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..19699b2fb3 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -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 @@ -39,7 +41,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -54,7 +56,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -70,11 +72,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index 4e3bc73fbe..c87925cb8e 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -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 @@ -35,7 +37,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -50,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -66,17 +68,17 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // check the file pointer position var_dump( feof($file_handle) ); // check if eof reached } - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - 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..60f7cdab63 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -7,12 +7,14 @@ 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 */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -30,7 +32,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("r","rb", "rt","r+", "r+b", "r+t"); @@ -40,7 +42,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { /* create an empty file and write the strings with tags */ create_file ($filename); //create an empty file - file_put_contents($filename, $string_with_tags); + file_put_contents($filename, $string_with_tags); $file_handle = fopen($filename, $file_modes[$mode_counter]); if(!$file_handle) { echo "Error: failed to open file $filename!\n"; @@ -52,7 +54,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + echo "-- Reading when file pointer points to EOF --\n"; var_dump( fseek($file_handle,0,SEEK_END) ); // now file pointer at end var_dump( ftell($file_handle) ); //ensure file pointer at end @@ -64,16 +66,16 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( fgetss($file_handle, 80, "<test>, <html>, <?>") ); var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file - fclose($file_handle); - // delete the file + + // close the file + fclose($file_handle); + // delete the file delete_file($filename); } // end of for - 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..211c158ae2 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -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 @@ -37,7 +39,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") { $string_with_tags = str_replace("\r",'', $string_with_tags); } -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -70,11 +72,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index 91d0b5c114..17e0935e84 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -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 @@ -34,7 +36,7 @@ this text contains some html tags <body> body </body> <br> br </br> this is the line with \n character. EOT; -$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; +$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; /* try reading the file opened in different modes of reading */ $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t"); @@ -67,17 +69,17 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - - // close the file + + // close the file fclose($file_handle); - - // delete the file + + // delete the file unlink($filename); } // end of for - 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 77d87dd820..d271c216f6 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -2,7 +2,7 @@ Test file() function : basic functionality --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array * Returns the file in an array @@ -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 fdf02fe109..1e7d51237a 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -2,7 +2,7 @@ Test file() function : error conditions --FILE-- <?php -/* +/* Prototype: array file ( string filename [,int use-include_path [,resource context]] ); Description: Reads entire file into an array Returns the file in an array @@ -18,7 +18,7 @@ var_dump( file($filename, $filename, $filename, $filename) ); // more than expe var_dump( file($filename, "INCORRECT_FLAG", NULL) ); // Incorrect flag var_dump( file($filename, 10, NULL) ); // Incorrect flag -var_dump( file("temp.tmp") ); // non existing filename +var_dump( file("temp.tmp") ); // non existing filename fclose($file_handle); echo "\n--- Done ---"; @@ -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_error.phpt b/ext/standard/tests/file/file_exists_error.phpt index 7d98e4d0a5..b20b2fe3a0 100644 --- a/ext/standard/tests/file/file_exists_error.phpt +++ b/ext/standard/tests/file/file_exists_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_exists() function : error conditions +Test file_exists() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : error conditions ***\n"; diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 7e3fda394d..2e8fd58d8e 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_exists() : usage variations ***\n"; @@ -20,7 +20,7 @@ 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_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt index f06628f516..631a138a07 100644 --- a/ext/standard/tests/file/file_get_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_error.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -28,7 +28,7 @@ print( file_get_contents($file_path."/file1.tmp", false, $file_handle, 1, 2, "ex echo "\n-- Testing for invalid negative maxlen values --"; var_dump( file_get_contents($file_path."/file1.tmp", FALSE, $file_handle, 0, -5) ); - + delete_files($file_path, 1); fclose($file_handle); unlink($file_path."/file_put_contents_error.tmp"); 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_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt index b2a09798e3..72fe121533 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt @@ -3,7 +3,7 @@ Test file-get_contents() and file_put_contents() functions : error conditions --FILE-- <?php /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[, - * resource $context[, int $offset[, int $maxlen]]]] ) + * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -31,7 +31,7 @@ print( file_get_contents("abc.tmp", false, $file_handle, 1, 2, "extra_argument") echo "\n-- Testing for invalid negative maxlen values --"; file_put_contents($file_path."/file_put_contents1.tmp", "Garbage data in the file"); var_dump( file_get_contents($file_path."/file_put_contents1.tmp", FALSE, NULL, 0, -5) ); - + fclose($file_handle); echo "\n*** Done ***\n"; 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 1ad7f5203c..694f930352 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 @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -36,12 +36,12 @@ echo "--- Done ---"; ?> --CLEAN-- <?php -//Deleting the temporary file +//Deleting the temporary file $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 af9ccbb714..63fe4ea365 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 @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -46,7 +46,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_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index 12bfd325ae..ddc926180d 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -40,7 +40,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 12d740c5f0..510ec12aed 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -41,7 +41,7 @@ function runtest() { fclose($h); $line = file_get_contents($filename, true); echo "$line\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index a302bf3e2f..035ecd3d68 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -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 f6f3c3a9c5..6c7f5a132c 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -107,10 +107,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); @@ -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..e4d610c035 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -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..8e23c65791 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -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..f253957709 100644 --- a/ext/standard/tests/file/file_get_contents_variation6.phpt +++ b/ext/standard/tests/file/file_get_contents_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : usage variation ***\n"; @@ -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_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index 27ddea0060..cc8eb40f49 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index baad767d6f..d350b4b037 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index 0fb662b0a8..17c55b6135 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index 4928404098..bb62eb47fb 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -11,14 +11,14 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( /* Invalid args */ "-1" => -1, @@ -30,8 +30,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 97a3495d54..5b325b0e98 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -11,15 +11,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -30,7 +30,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index f4188c2102..09d33f9f32 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_get_contents() : variation ***\n"; @@ -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.phpt b/ext/standard/tests/file/file_put_contents.phpt index 1607ab1bde..4566c37567 100644 --- a/ext/standard/tests/file/file_put_contents.phpt +++ b/ext/standard/tests/file/file_put_contents.phpt @@ -21,7 +21,7 @@ var_dump(file_put_contents($file, "string", 0, $fp)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index f9a2d0e7e2..a0d275ccc5 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -28,11 +28,11 @@ echo filesize($filename)."\n"; readfile($filename); echo "\n"; unlink($filename); - + ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : variation *** int(25) int(18) diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index ae56486d5f..753e287504 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file_put_contents() function : usage variation - different data types to write +Test file_put_contents() function : usage variation - different data types to write --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index 1506726dc4..4a8daad29f 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -106,10 +106,10 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //non context resource 'file resource' => $fileRes, - + //valid stream context 'stream context' => $strContext, ); @@ -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_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 339e9b73a7..62d814c9fd 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -5,15 +5,15 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); -$thisTestDir = basename(__FILE__, ".php") . ".dir"; +$thisTestDir = basename(__FILE__, ".php") . ".dir"; mkdir($thisTestDir); chdir($thisTestDir); @@ -35,7 +35,7 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists + //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); $line = file_get_contents($filename); diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt index fed872f8a3..fe1961d16c 100644 --- a/ext/standard/tests/file/file_put_contents_variation5.phpt +++ b/ext/standard/tests/file/file_put_contents_variation5.phpt @@ -10,7 +10,7 @@ $thisTestDir = dirname(__FILE__) . '/' .basename(__FILE__, ".php") . ".directory mkdir($thisTestDir); chdir($thisTestDir); -$filename = basename(__FILE__, ".php") . ".tmp"; +$filename = basename(__FILE__, ".php") . ".tmp"; $scriptLocFile = dirname(__FILE__)."/".$filename; $newpath = "rubbish"; @@ -35,9 +35,9 @@ function runtest() { echo "Fail - this is PHP52 behaviour\n"; unlink($scriptLocFile); }else { - $line = file_get_contents($filename); + $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index 7f963a01fe..a0977faff8 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : variation ***\n"; @@ -37,14 +37,14 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists + //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); - file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); + file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND); $line = file_get_contents($filename); echo "$line\n"; - unlink($filename); + unlink($filename); } ?> diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index d4ee0585fd..e1a94a2043 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); @@ -73,7 +73,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index 94cfa627d3..b1b2face60 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -33,14 +33,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; @@ -65,7 +65,7 @@ for($i = 0; $i<count($allDirs); $i++) { else { echo "No data written\n"; } - + } chdir($old_dir_path); diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 095980b536..92fe7b3d6a 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -10,14 +10,14 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; -/* An array of filenames */ +/* An array of filenames */ $names_arr = array( "-1" => -1, "TRUE" => TRUE, @@ -28,8 +28,8 @@ $names_arr = array( "\\0" => "\0", "array()" => array(), - /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + /* prefix with path separator of a non existing directory*/ + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); @@ -42,7 +42,7 @@ foreach($names_arr as $key =>$value) { unlink($value); } else { echo "Failed to write data to: $key\n"; - } + } }; ?> diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt Binary files differindex 20a2861bca..3cd92c5ec8 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 64a5a67e33..79a42fe9b1 100644 --- a/ext/standard/tests/file/file_put_contents_variation9.phpt +++ b/ext/standard/tests/file/file_put_contents_variation9.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file_put_contents() : usage variation ***\n"; @@ -34,7 +34,7 @@ run_test($softlink); //can only create a hardlink if the file exists. file_put_contents($filename,""); -link($filename, $hardlink); +link($filename, $hardlink); run_test($hardlink); unlink($chainlink); diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 80f5503cd6..9629d37aa9 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -2,7 +2,7 @@ Test file() function : usage variations --FILE-- <?php -/* +/* * Prototype: array file ( string filename [,int use-include_path [,resource context]] ); * Description: Reads entire file into an array Returns the file in an array @@ -17,8 +17,8 @@ foreach( $data_array as $data ) { echo "--Iteration $count --\n"; $fh = fopen($file_path."/file_variation.tmp", "w"); fwrite($fh, $data); - var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); - var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); + var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); $count++; fclose($fh); } @@ -64,7 +64,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_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt index 9c3ad0e546..ab37ea5c45 100644 --- a/ext/standard/tests/file/file_variation2.phpt +++ b/ext/standard/tests/file/file_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file() function : first parameter variation +Test file() function : first parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt index 9001a84318..250621ef73 100644 --- a/ext/standard/tests/file/file_variation3.phpt +++ b/ext/standard/tests/file/file_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test file() function : second parameter variation +Test file() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; @@ -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..9c92ae699f 100644 --- a/ext/standard/tests/file/file_variation4.phpt +++ b/ext/standard/tests/file/file_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file() function : third parameter variation +Test file() function : third parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file stream resource 'file stream resource' => $file_stream_resource, ); @@ -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_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt index b8badd0e42..1f15491118 100644 --- a/ext/standard/tests/file/file_variation5.phpt +++ b/ext/standard/tests/file/file_variation5.phpt @@ -25,7 +25,7 @@ var_dump(file("./$test_dirname/../$filename")); echo "\nfile() on a path containing .. with invalid directories\n"; var_dump(file("./$test_dirname/bad_dir/../../$filename")); - + echo "\nfile() on a linked file\n"; $linkname = "somelink"; var_dump(symlink($filepath, $linkname)); diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index 6debeaac7e..ca3be36b56 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index b4f1311ef0..be18fcb032 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'FileGetContentsVar7.tmp'; diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index b95f9962e7..623fa56409 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing file() : variation ***\n"; @@ -21,7 +21,7 @@ $contents = array( "File has\r\nmultiple crlfs\n\r\n" ); -@unlink($testfile); +@unlink($testfile); foreach ($contents as $content) { $h = fopen($testfile, "w"); fwrite($h, $content); @@ -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/filegroup_basic.phpt b/ext/standard/tests/file/filegroup_basic.phpt index 2c8216a0ad..36333b21ba 100644 --- a/ext/standard/tests/file/filegroup_basic.phpt +++ b/ext/standard/tests/file/filegroup_basic.phpt @@ -12,7 +12,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -echo "*** Testing filegroup(): basic functionality ***\n"; +echo "*** Testing filegroup(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; diff --git a/ext/standard/tests/file/filegroup_variation1.phpt b/ext/standard/tests/file/filegroup_variation1.phpt index 4b4a9aa00e..ee76477ac8 100644 --- a/ext/standard/tests/file/filegroup_variation1.phpt +++ b/ext/standard/tests/file/filegroup_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying filegroup() on links */ +/* Creating soft and hard links to a file and applying filegroup() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/filegroup_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt index 966a9f43b7..afac40c9ab 100644 --- a/ext/standard/tests/file/filegroup_variation2.phpt +++ b/ext/standard/tests/file/filegroup_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( filegroup($filename) ); diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt index ebefeb7e3f..b275944f78 100644 --- a/ext/standard/tests/file/filegroup_variation3.phpt +++ b/ext/standard/tests/file/filegroup_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/filegroup_variation3//filegroup_variation3.tmp", "//filegroup_variation3//filegroup_variation3.tmp", "/filegroup_variation3/*.tmp", - "filegroup_variation3/filegroup*.tmp", + "filegroup_variation3/filegroup*.tmp", /* Testing Binary safe */ "/filegroup_variation3/filegroup_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileinode_basic.phpt b/ext/standard/tests/file/fileinode_basic.phpt index c7fc77e7d5..98e5cf0836 100644 --- a/ext/standard/tests/file/fileinode_basic.phpt +++ b/ext/standard/tests/file/fileinode_basic.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt index 892121cc96..eb5d79e0c3 100644 --- a/ext/standard/tests/file/fileinode_error.phpt +++ b/ext/standard/tests/file/fileinode_error.phpt @@ -2,7 +2,7 @@ Test fileinode() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt index 9504766d9d..1fac953098 100644 --- a/ext/standard/tests/file/fileinode_variation.phpt +++ b/ext/standard/tests/file/fileinode_variation.phpt @@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ diff --git a/ext/standard/tests/file/fileinode_variation1.phpt b/ext/standard/tests/file/fileinode_variation1.phpt index 4961db19a6..d251cc3f85 100644 --- a/ext/standard/tests/file/fileinode_variation1.phpt +++ b/ext/standard/tests/file/fileinode_variation1.phpt @@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileinode() on links */ +/* Creating soft and hard links to a file and applying fileinode() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileinode_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt index 447c189e04..e8e7af6a6e 100644 --- a/ext/standard/tests/file/fileinode_variation2.phpt +++ b/ext/standard/tests/file/fileinode_variation2.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - invalid filenames Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileinode($filename) ); diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt index 2f51e8f595..ca84864b59 100644 --- a/ext/standard/tests/file/fileinode_variation3.phpt +++ b/ext/standard/tests/file/fileinode_variation3.phpt @@ -4,7 +4,7 @@ Test fileinode() function: usage variations - diff. path notations Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* Prototype: int fileinode ( string $filename ); Description: Returns the inode number of the file, or FALSE in case of an error. */ @@ -29,7 +29,7 @@ $files_arr = array( "/fileinode_variation3//fileinode_variation3.tmp", "//fileinode_variation3//fileinode_variation3.tmp", "/fileinode_variation3/*.tmp", - "fileinode_variation3/fileinode*.tmp", + "fileinode_variation3/fileinode*.tmp", /* Testing Binary safe */ "/fileinode_variation3/fileinode_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt index 05e4c16ef8..5b5ff9a900 100644 --- a/ext/standard/tests/file/fileowner_basic.phpt +++ b/ext/standard/tests/file/fileowner_basic.phpt @@ -7,7 +7,7 @@ Test fileowner() function: basic functionality * FALSE in case of an error. */ -echo "*** Testing fileowner(): basic functionality ***\n"; +echo "*** Testing fileowner(): basic functionality ***\n"; echo "-- Testing with the file or directory created by owner --\n"; var_dump( fileowner(__FILE__) ); diff --git a/ext/standard/tests/file/fileowner_variation1.phpt b/ext/standard/tests/file/fileowner_variation1.phpt index e40175d1bd..b70ac366d2 100644 --- a/ext/standard/tests/file/fileowner_variation1.phpt +++ b/ext/standard/tests/file/fileowner_variation1.phpt @@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileowner() on links */ +/* Creating soft and hard links to a file and applying fileowner() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileowner_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt index 83eeb6d5c0..feff767879 100644 --- a/ext/standard/tests/file/fileowner_variation2.phpt +++ b/ext/standard/tests/file/fileowner_variation2.phpt @@ -24,12 +24,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileowner($filename) ); diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt index 5768f528f1..6f91c31d11 100644 --- a/ext/standard/tests/file/fileowner_variation3.phpt +++ b/ext/standard/tests/file/fileowner_variation3.phpt @@ -29,7 +29,7 @@ $files_arr = array( "/fileowner_variation3//fileowner_variation3.tmp", "//fileowner_variation3//fileowner_variation3.tmp", "/fileowner_variation3/*.tmp", - "fileowner_variation3/fileowner*.tmp", + "fileowner_variation3/fileowner*.tmp", /* Testing Binary safe */ "/fileowner_variation3/fileowner_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/fileperms_variation1.phpt b/ext/standard/tests/file/fileperms_variation1.phpt index fdcedcac59..e90cf8784f 100644 --- a/ext/standard/tests/file/fileperms_variation1.phpt +++ b/ext/standard/tests/file/fileperms_variation1.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { * Description: Returns the group ID of the file, or FALSE in case of an error. */ -/* Creating soft and hard links to a file and applying fileperms() on links */ +/* Creating soft and hard links to a file and applying fileperms() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/fileperms_variation1.tmp", "w") ); diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt index f9b190bcf8..47c0c6593a 100644 --- a/ext/standard/tests/file/fileperms_variation2.phpt +++ b/ext/standard/tests/file/fileperms_variation2.phpt @@ -23,12 +23,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( fileperms($filename) ); diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt index 6ae97d1601..575fe11a2f 100644 --- a/ext/standard/tests/file/fileperms_variation3.phpt +++ b/ext/standard/tests/file/fileperms_variation3.phpt @@ -28,7 +28,7 @@ $files_arr = array( "/fileperms_variation3//fileperms_variation3.tmp", "//fileperms_variation3//fileperms_variation3.tmp", "/fileperms_variation3/*.tmp", - "fileperms_variation3/fileperms*.tmp", + "fileperms_variation3/fileperms*.tmp", /* Testing Binary safe */ "/fileperms_variation3/fileperms_variation3.tmp".chr(0), diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt index 5a11259b6b..58041b95c3 100644 --- a/ext/standard/tests/file/filesize_basic.phpt +++ b/ext/standard/tests/file/filesize_basic.phpt @@ -2,14 +2,14 @@ Test filesize() function: basic functionaity --FILE-- <?php -/* +/* * Prototype: int filesize ( string $filename ); - * Description: Returns the size of the file in bytes, or FALSE + * Description: Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing size of files and directories with filesize() ***\n"; +echo "*** Testing size of files and directories with filesize() ***\n"; $file_path = dirname(__FILE__); @@ -30,7 +30,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/filesize_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECTF-- *** Testing size of files and directories with filesize() *** int(%d) int(%d) diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 0060e66f55..6d8cfa8693 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -2,9 +2,9 @@ Test filesize() function: error conditions --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ @@ -23,7 +23,7 @@ echo "\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): error conditions *** Warning: filesize(): stat failed for /no/such/file in %s on line %d bool(false) diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 66e193c201..d4ec8e571e 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) @@ -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..3c2841afe0 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) @@ -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.phpt b/ext/standard/tests/file/filesize_variation1.phpt index d8d3aff27a..0a490cd7e6 100644 --- a/ext/standard/tests/file/filesize_variation1.phpt +++ b/ext/standard/tests/file/filesize_variation1.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "*** Checking filesize() with different size of files ***\n"; for($size = 1; $size <10000; $size = $size+1000) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 71577d8301..7322b78aae 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation", 2); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); @@ -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_variation2.phpt b/ext/standard/tests/file/filesize_variation2.phpt index 0379451660..8a7594ee79 100644 --- a/ext/standard/tests/file/filesize_variation2.phpt +++ b/ext/standard/tests/file/filesize_variation2.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n"; echo "-- Creating a base dir, and checking its size --\n"; @@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); -echo "-- Creating a file inside base dir, and checking dir & file size --\n"; +echo "-- Creating a file inside base dir, and checking dir & file size --\n"; create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation"); var_dump( filesize( $file_path."/filesize_variation2")); clearstatcache(); diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt index 215c767616..94ba6f478a 100644 --- a/ext/standard/tests/file/filesize_variation3-win32.phpt +++ b/ext/standard/tests/file/filesize_variation3-win32.phpt @@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation3.phpt b/ext/standard/tests/file/filesize_variation3.phpt index 604887d116..67d46998d2 100644 --- a/ext/standard/tests/file/filesize_variation3.phpt +++ b/ext/standard/tests/file/filesize_variation3.phpt @@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; $filename = $file_path."/filesize_variation3.tmp"; $file_handle = fopen($filename, "w"); fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 08e141707e..5b6aec9fe9 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ $file_path = dirname(__FILE__); require($file_path."/file.inc"); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; @@ -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..ffea82c234 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -7,9 +7,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } --FILE-- <?php -/* +/* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ @@ -17,7 +17,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n"; $filename = $file_path."/filesize_variation4.tmp"; @@ -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/filesize_variation5.phpt b/ext/standard/tests/file/filesize_variation5.phpt index 9d1338481d..638f8ba8ed 100644 --- a/ext/standard/tests/file/filesize_variation5.phpt +++ b/ext/standard/tests/file/filesize_variation5.phpt @@ -4,13 +4,13 @@ Test filesize() function: usage variations - size of files Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ -echo "*** Testing filesize(): usage variations ***\n"; +echo "*** Testing filesize(): usage variations ***\n"; /* null, false, "", " " */ var_dump( filesize(NULL) ); @@ -20,7 +20,7 @@ var_dump( filesize(' ') ); var_dump( filesize('|') ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing filesize(): usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt index f6031219c7..d02f9f2a10 100644 --- a/ext/standard/tests/file/filestat.phpt +++ b/ext/standard/tests/file/filestat.phpt @@ -29,7 +29,7 @@ var_dump(filectime("/no/such/file/or/dir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index b8ff92f18a..0cb1e7361a 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -5,7 +5,7 @@ Test filetype() function: Basic functionality /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with files and dirs ***\n"; @@ -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_error.phpt b/ext/standard/tests/file/filetype_error.phpt index b49a5286c6..b965272011 100644 --- a/ext/standard/tests/file/filetype_error.phpt +++ b/ext/standard/tests/file/filetype_error.phpt @@ -5,7 +5,7 @@ Test filetype() function: Error conditions /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing error conditions ***"; diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 4a96b71e1c..e09af42570 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -14,7 +14,7 @@ if (!function_exists("posix_mkfifo")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with various types ***\n"; @@ -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..b6a2961843 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -9,21 +9,21 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { } if (!file_exists("/dev/null")) { die('skip /dev/null not available'); -} +} ?> --FILE-- <?php /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ 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..5b453d7788 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -16,14 +16,14 @@ if (!file_exists("/dev/ram0")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ 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.phpt b/ext/standard/tests/file/flock.phpt index 2330270113..ab08de5256 100644 --- a/ext/standard/tests/file/flock.phpt +++ b/ext/standard/tests/file/flock.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- Warning: flock() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index 99b1ba1c59..bb27cb439f 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -2,13 +2,13 @@ Test flock() function: Basic functionality --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ -echo "*** Testing flock() fun with file and dir ***\n"; +echo "*** Testing flock() fun with file and dir ***\n"; $file_path = dirname(__FILE__); $file_handle = fopen("$file_path/lock.tmp", "w"); @@ -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..216e70c246 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -2,9 +2,9 @@ Test flock() function: Error conditions --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ @@ -23,7 +23,7 @@ $operations = array( array(), "string", "", - "\0" + "\0" ); $i = 0; @@ -55,7 +55,7 @@ echo "\n*** Done ***\n"; $file = dirname(__FILE__)."/flock.tmp"; unlink($file); ?> ---EXPECTF-- +--EXPECTF-- *** Testing error conditions *** --- Iteration 0 --- @@ -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..02cb0ff282 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -2,9 +2,9 @@ Test flock() function: Variations --FILE-- <?php -/* +/* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ @@ -21,7 +21,7 @@ $operations = array( LOCK_EX|LOCK_NB, LOCK_SH|LOCK_EX, LOCK_UN, - 1, + 1, 2, 2.234, TRUE @@ -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/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt index 61ddb2e09c..5277874ba6 100644 --- a/ext/standard/tests/file/fnmatch_error.phpt +++ b/ext/standard/tests/file/fnmatch_error.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing error conditions for fnmatch() ***"; diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index b3607be58b..6d28528c1c 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing fnmatch() with file and various patterns ***\n"; @@ -43,7 +43,7 @@ $pattern_arr = array( 17 => "?match?", 18 => "match.tmp", 19 => "/match.tmp", -20 => "/match.tmp/", +20 => "/match.tmp/", 21 => 'match.tmp', 22 => 'match.tmp\0', 23 => "match.tmp\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 bbae6f839a..5f38cbba65 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -15,9 +15,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -30,18 +30,18 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', - 'c:'.$rootdir, - 'c:adir', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', + 'c:'.$rootdir, + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation10.tmp"; @@ -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,6 +144,6 @@ 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 28db5ca780..85265063d1 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -14,9 +14,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -29,18 +29,18 @@ mkdir('c:\\'.$rootdir); $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3); -$paths = array('c:\\', - 'c:', - 'c', - '\\', - '/', - 'c:'.$rootdir, - 'c:adir', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c', + '\\', + '/', + 'c:'.$rootdir, + 'c:adir', + 'c:\\/', 'c:\\'.$rootdir.'\\/', - 'c:\\'.$rootdir.'\\', + 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation11.tmp"; @@ -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,6 +142,6 @@ 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_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index e39ecedf87..c207ec1836 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ set_include_path("rubbish"); @@ -16,12 +16,12 @@ restore_include_path(); function testme() { - $tmpfile = basename(__FILE__, ".php") . ".tmp"; + $tmpfile = basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -31,9 +31,9 @@ function testme() { fclose($h); unlink($tmpfile); } + - - $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; + $scriptDirFile = dirname(__FILE__).'/'.$tmpfile; $h = @fopen($scriptDirFile, "r"); if ($h === false) { echo "Not created in script dir\n"; @@ -41,7 +41,7 @@ function testme() { else { echo "created in script dir\n"; fclose($h); - unlink($scriptDirFile); + unlink($scriptDirFile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index 76cf084029..d540d70006 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -28,13 +28,13 @@ function runtest() { $tempDir = 'fopen_variation13.dir.tmp'; $tmpfile = 'fopen_variation13.tmp'; $absFile = getcwd().'/'.$tempDir.'/'.$tmpfile; - + mkdir($tempDir); $h = fopen($absFile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = fopen($absFile, "r"); if ($h === false) { echo "Not created absolute location\n"; @@ -45,7 +45,7 @@ function runtest() { } unlink($absFile); rmdir($tempDir); - + } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 8c4c23fb30..554d8c6ded 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -53,15 +53,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -73,14 +73,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index b62bedfe68..aa4e05b892 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -45,15 +45,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r'); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -65,14 +65,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w'); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 0dd3d23857..8599306eda 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -57,15 +57,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -77,14 +77,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 3dca66841f..24b01fbe8c 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -49,15 +49,15 @@ function runtest($fileURIs) { $iteration = 0; foreach($fileURIs as $fileURI) { echo "--- READ: $fileURI ---\n"; - + $readData = "read:$iteration"; $writeData = "write:$iteration"; - + // create the file and test read $h = fopen($absFile, 'w'); fwrite($h, $readData); fclose($h); - + $h = fopen($fileURI, 'r', true); if ($h !== false) { if (fread($h, 4096) != $readData) { @@ -69,14 +69,14 @@ function runtest($fileURIs) { fclose($h); } unlink($absFile); - - echo "--- WRITE: $fileURI ---\n"; + + echo "--- WRITE: $fileURI ---\n"; // create the file to test write $h = fopen($fileURI, 'w', true); if ($h !== false) { fwrite($h, $writeData); fclose($h); - + $h = fopen($absFile, 'r'); if ($h !== false) { if (fread($h, 4096) != $writeData) { diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 023586c396..8b793f7858 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,18 +31,18 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir16"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir.'/fopen_variation16.tmp'; $h = fopen($tmpfile, "w+", true); fwrite($h, "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -60,10 +60,10 @@ function runtest() { echo "found file - not in dir1\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 429650564b..461807d26f 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -1,13 +1,13 @@ --TEST-- -Test fopen() function : variation: use include path create and read a file (relative) +Test fopen() function : variation: use include path create and read a file (relative) --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -31,17 +31,17 @@ rmdir($thisTestDir); function runtest() { global $dir1; - + $extraDir = "extraDir17"; mkdir($dir1.'/'.$extraDir); mkdir($extraDir); - + $tmpfile = $extraDir . '/' . basename(__FILE__, ".php") . ".tmp"; $h = fopen($tmpfile, "w+", true); fwrite($h, "This is the test file"); fclose($h); - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -59,10 +59,10 @@ function runtest() { echo "found file for reading\n"; fclose($h); } - - unlink($tmpfile); - rmdir($dir1.'/'.$extraDir); - rmdir($extraDir); + + unlink($tmpfile); + rmdir($dir1.'/'.$extraDir); + rmdir($extraDir); } ?> ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index 069ce11170..031ba45734 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ $tmpDir = 'fopenVar19.Dir'; diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt index 7430471623..b4301743d4 100644 --- a/ext/standard/tests/file/fopen_variation3.phpt +++ b/ext/standard/tests/file/fopen_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; @@ -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..7a92a0a29f 100644 --- a/ext/standard/tests/file/fopen_variation4.phpt +++ b/ext/standard/tests/file/fopen_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : usage variation ***\n"; @@ -103,7 +103,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + //file resource 'file resource' => $fileresource ); @@ -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 039722e782..ecfac73007 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -60,7 +60,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, "in dir2"); @@ -77,44 +77,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, "in working dir"); fclose($h); - + //should still read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the file in working dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); @@ -123,7 +123,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 7bfb7c0ef5..258fa7f073 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test fopen() function : variation: use include path and stream context relative/absolute file +Test fopen() function : variation: use include path and stream context relative/absolute file --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fopen() : variation ***\n"; @@ -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_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 9cb40a0019..f5c1048c07 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen($dir1.'/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink($dir1.'/'.$tmpfile); + unlink($dir1.'/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 5eb415bc14..02637c2106 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ @@ -40,7 +40,7 @@ chdir($workingDir); //define the files to go into these directories, create one in dir2 echo "\n--- testing include path ---\n"; -set_include_path($newIncludePath); +set_include_path($newIncludePath); $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); @@ -59,7 +59,7 @@ rmdir($thisTestDir); function test_fopen($mode) { global $scriptFile, $secondFile, $firstFile, $filename; - + // create a file in the middle directory $h = fopen($secondFile, "w"); fwrite($h, "in dir2"); @@ -76,44 +76,44 @@ function test_fopen($mode) { $h = fopen($firstFile, "w"); fwrite($h, "in dir1"); fclose($h); - + //should now read dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in working directory $h = fopen($filename, "w"); fwrite($h, "in working dir"); fclose($h); - + //should read the dir1 file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + unlink($firstFile); unlink($secondFile); - + //should read the working dir file $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + // create a file in the script directory $h = fopen($scriptFile, "w"); fwrite($h, "in script dir"); fclose($h); - + //should read the file in script dir $h = fopen($filename, $mode, true); fpassthru($h); fclose($h); echo "\n"; - + //cleanup unlink($filename); unlink($scriptFile); @@ -122,7 +122,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index bee941eb94..5d1ca139f4 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -34,8 +34,8 @@ function runtest() { $h = fopen($tmpfile, "w", true); fwrite($h, "This is the test file"); fclose($h); - - + + $h = @fopen($tmpfile, "r"); if ($h === false) { echo "Not created in working dir\n"; @@ -45,7 +45,7 @@ function runtest() { fclose($h); unlink($tmpfile); } - + $h = @fopen('dir1/'.$tmpfile, "r"); if ($h === false) { echo "Not created in dir1\n"; @@ -53,7 +53,7 @@ function runtest() { else { echo "created in dir1\n"; fclose($h); - unlink('dir1/'.$tmpfile); + unlink('dir1/'.$tmpfile); } } ?> diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt index 79922e31e1..cd6bed89cf 100644 --- a/ext/standard/tests/file/fopencookie.phpt +++ b/ext/standard/tests/file/fopencookie.phpt @@ -20,12 +20,12 @@ fopencookie detected and working (or cast mechanism works) class userstream { public $position = 0; public $data = "If you can read this, it worked"; - + function stream_open($path, $mode, $options, &$opened_path) { return true; } - + function stream_read($count) { $ret = substr($this->data, $this->position, $count); diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8555f3782a..7389bd2105 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Basic functionality --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. @@ -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..f761d09482 100644 --- a/ext/standard/tests/file/fpassthru_error.phpt +++ b/ext/standard/tests/file/fpassthru_error.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Error conditions --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. @@ -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..2c9e6e6cd3 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -2,7 +2,7 @@ Test fpassthru() function: Variations --FILE-- <?php -/* +/* Prototype: int fpassthru ( resource $handle ); Description: Reads to EOF on the given file pointer from the current position and writes the results to the output buffer. @@ -22,7 +22,7 @@ $file_read = fopen($file_name, "r"); $offset_arr = array( /* Positive offsets */ 0, - 1, + 1, 5, 10, 20, @@ -30,10 +30,10 @@ $offset_arr = array( 35, 36, 70, - /* Negative offsets, the file pointer should be at the end of file + /* Negative offsets, the file pointer should be at the end of file to get data */ - -1, - -5, + -1, + -5, -10, -20, -35, @@ -48,12 +48,12 @@ for( $i=0; $i<count($offset_arr); $i++ ) { var_dump(fpassthru($file_read) ); rewind( $file_read ); }else - { + { fseek($file_read, $offset_arr[$i], SEEK_END); var_dump( fpassthru($file_read) ); rewind( $file_read ); - } -} + } +} fclose($file_read); // closing the handle @@ -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 9af128298a..4458dbd124 100644 --- a/ext/standard/tests/file/fpassthru_variation1.phpt +++ b/ext/standard/tests/file/fpassthru_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fpassthru(resource fp) - * Description: Output all remaining data from a file pointer + * Description: Output all remaining data from a file pointer * Source code: ext/standard/file.c * Alias to functions: gzpassthru */ @@ -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 ca958da3d7..c98d49c6ce 100644 --- a/ext/standard/tests/file/fputcsv_error.phpt +++ b/ext/standard/tests/file/fputcsv_error.phpt @@ -5,7 +5,7 @@ Test fputcsv() function : error conditions /* Prototype: int fputcsv ( resource $handle [, array $fields [, string $delimiter [, string $enclosure]]] ); Description:fputcsv() formats a line (passed as a fields array) as CSV and write it to the specified file - handle. Returns the length of the written string, or FALSE on failure. + handle. Returns the length of the written string, or FALSE on failure. */ echo "*** Testing error conditions ***\n"; @@ -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/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt index bad44ea0c3..68df33c8ec 100644 --- a/ext/standard/tests/file/fputcsv_variation1.phpt +++ b/ext/standard/tests/file/fputcsv_variation1.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with all parameters specified --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when all its parameters are provided */ echo "*** Testing fputcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation1.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt index 69fcadbfb6..21d845ffa7 100644 --- a/ext/standard/tests/file/fputcsv_variation10.phpt +++ b/ext/standard/tests/file/fputcsv_variation10.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with line without any csv fields +Test fputcsv() : usage variations - with line without any csv fields --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with line without any csv fields echo "*** Testing fputcsv() : with no CSV format in the field ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -28,13 +28,13 @@ $filename = "$file_path/fputcsv_variation10.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($fields as $field) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -46,22 +46,22 @@ foreach ($fields as $field) { exit(); } $csv_field = $field; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); - + // check the file pointer position and eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt index 83e80adba2..770b89b711 100644 --- a/ext/standard/tests/file/fputcsv_variation11.phpt +++ b/ext/standard/tests/file/fputcsv_variation11.phpt @@ -1,18 +1,18 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure value +Test fputcsv() : usage variations - with default enclosure value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value is provided */ echo "*** Testing fputcsv() : with default enclosure value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation11.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt index f177965686..24fe5c4658 100644 --- a/ext/standard/tests/file/fputcsv_variation12.phpt +++ b/ext/standard/tests/file/fputcsv_variation12.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure and different delimiter +Test fputcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter value @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure and different delimit echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation12.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+') ); // check the file pointer position and eof @@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt index 0518cb7435..a8a350b222 100644 --- a/ext/standard/tests/file/fputcsv_variation13.phpt +++ b/ext/standard/tests/file/fputcsv_variation13.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure & delimiter of two chars +Test fputcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation13.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++') ); // check the file pointer position and eof @@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 2cbbf517ed..36a4975c12 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -2,9 +2,9 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read only modes) --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -51,8 +51,8 @@ foreach ($csv_lists as $csv_list) { exit(); } fclose($file_handle); - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // add the content with has csv fields $file_handle = fopen($filename, $file_modes[$mode_counter] ); if ( !$file_handle ) { @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%') ); // check the file pointer position and eof @@ -70,13 +70,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt index 5cbaed0fdd..3ec4e91f2a 100644 --- a/ext/standard/tests/file/fputcsv_variation2.phpt +++ b/ext/standard/tests/file/fputcsv_variation2.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with delimiter as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter is NULL */ echo "*** Testing fputcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation2.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, $enclosure) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt index f184ffabf2..14a2503eca 100644 --- a/ext/standard/tests/file/fputcsv_variation3.phpt +++ b/ext/standard/tests/file/fputcsv_variation3.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when enclosure is NULL */ echo "*** Testing fputcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation3.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, NULL) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt index 02c7485d7e..bc374ad397 100644 --- a/ext/standard/tests/file/fputcsv_variation4.phpt +++ b/ext/standard/tests/file/fputcsv_variation4.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with delimiter and enclosure as NULL --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter and enclosure is NULL */ echo "*** Testing fputcsv() : with delimiter and enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation4.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, NULL, NULL) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt index 49f6d81d10..9d78854d71 100644 --- a/ext/standard/tests/file/fputcsv_variation5.phpt +++ b/ext/standard/tests/file/fputcsv_variation5.phpt @@ -2,17 +2,17 @@ Test fputcsv() : usage variations - with default arguments value --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default arguments values are considered */ echo "*** Testing fputcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation5.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field) ); // check the file pointer position and eof @@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt index 5de601707c..f30ce24f40 100644 --- a/ext/standard/tests/file/fputcsv_variation6.phpt +++ b/ext/standard/tests/file/fputcsv_variation6.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and enclosure +Test fputcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation6.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', '%') ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt index 789825de52..8329251d73 100644 --- a/ext/standard/tests/file/fputcsv_variation7.phpt +++ b/ext/standard/tests/file/fputcsv_variation7.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and same enclosure +Test fputcsv() : usage variations - with different delimiter and same enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation7.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure) ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt index 74c10852d8..096f37908a 100644 --- a/ext/standard/tests/file/fputcsv_variation8.phpt +++ b/ext/standard/tests/file/fputcsv_variation8.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with same delimiter and different enclosure +Test fputcsv() : usage variations - with same delimiter and different enclosure --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation8.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+') ); // check the file pointer position and eof @@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt index c4c560971a..386d7bd1e7 100644 --- a/ext/standard/tests/file/fputcsv_variation9.phpt +++ b/ext/standard/tests/file/fputcsv_variation9.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - two chars as enclosure & delimiter +Test fputcsv() : usage variations - two chars as enclosure & delimiter --FILE-- <?php -/* +/* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - two chars as enclosure & delimiter echo "*** Testing fputcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation9.tmp"; $file_modes = array ("r+", "r+b", "r+t", "a+", "a+b", "a+t", "w+", "w+b", "w+t", - "x+", "x+b", "x+t"); + "x+", "x+b", "x+t"); $loop_counter = 1; foreach ($csv_lists as $csv_list) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { - - echo "\n-- file opened in $file_modes[$mode_counter] --\n"; + + echo "\n-- file opened in $file_modes[$mode_counter] --\n"; // create the file and add the content with has csv fields if ( strstr($file_modes[$mode_counter], "r") ) { $file_handle = fopen($filename, "w"); @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { $delimiter = $csv_list[0]; $enclosure = $csv_list[1]; $csv_field = $csv_list[2]; - + // write to a file in csv format var_dump( fputcsv($file_handle, $csv_field, '++', '%%' ) ); @@ -63,13 +63,13 @@ foreach ($csv_lists as $csv_list) { var_dump( feof($file_handle) ); //close the file fclose($file_handle); - - // print the file contents + + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index c88491f17c..4cdeffb5ab 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -4,19 +4,19 @@ Test fread() function : basic functionality <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ // include the file.inc for common functions for test include ("file.inc"); -/* Function : function check_size(string $data, int $expect_size) +/* Function : function check_size(string $data, int $expect_size) Description : Check the length of the data, and compare the size with $expect_size $data : Text data. - $expect_size : Expected data length + $expect_size : Expected data length */ function check_size($data, $expect_size) { @@ -29,36 +29,36 @@ function check_size($data, $expect_size) { echo "*** Testing fread() basic operations ***\n"; -/* +/* test fread with file opened in "r" and "rb" mode only - Content with numeric and strings with it + Content with numeric and strings with it */ $file_modes = array( "r", "rb", "rt", "r+", "r+b", "r+t"); $file_content_types = array("numeric","text","text_with_new_line","alphanumeric"); foreach($file_content_types as $file_content_type) { echo "\n-- Testing fread) with file having data of type ". $file_content_type ." --\n"; - /* create files with $file_content_type */ + /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_basic"); $filename = dirname(__FILE__)."/fread_basic1.tmp"; // this is name of the file created by create_files() - + /* open the file using $files_modes and perform fread() on it */ - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { - + echo "-- File opened in mode ".$file_modes[$inner_loop_counter]." --\n"; $file_handle = fopen($filename, $file_modes[$inner_loop_counter]); if (!$file_handle) { echo "Error: failed to fopen() file: $filename!"; exit(); } - - /* read file by giving the acutal length, check the length and content by calculating the - hash using md5() function + + /* read file by giving the acutal length, check the length and content by calculating the + hash using md5() function */ /* Reading 1024 bytes from file, expecting 1024 bytes */ ; - + var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); echo "Reading 1024 bytes from file, expecting 1024 bytes ... "; @@ -68,7 +68,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump( feof($file_handle) ); var_dump( md5($data_from_file) ); // calculate the hash and dump it - /* read file by giving size more than its size */ + /* read file by giving size more than its size */ var_dump(rewind($file_handle)); var_dump(ftell($file_handle)); var_dump( feof($file_handle) ); @@ -94,12 +94,12 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump(fclose($file_handle)); // now close the file } // end of inner for loop - // delete the file created + // delete the file created delete_file($filename); // delete file with name } // 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..d500e6827a 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -4,14 +4,14 @@ Test fread() function : error conditions <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ echo "*** Testing error conditions ***\n"; -$filename = __FILE__; +$filename = __FILE__; $file_handle = fopen($filename, "r"); // zero argument @@ -22,9 +22,9 @@ var_dump( fread() ); echo "-- Testing fread() with more than expected number of arguments --\n"; var_dump( fread($file_handle, 10, $file_handle) ); -// invalid length argument +// invalid length argument echo "-- Testing fread() with invalid length arguments --\n"; -$len = 0; +$len = 0; var_dump( fread($file_handle, $len) ); $len = -10; var_dump( fread($file_handle, $len) ); @@ -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_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt index d930e55a71..0f5c4ed763 100644 --- a/ext/standard/tests/file/fread_fwrite_basic.phpt +++ b/ext/standard/tests/file/fread_fwrite_basic.phpt @@ -5,16 +5,16 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php -/* +/* * proto int fwrite(resource fp, string str [, int length]) * Function is implemented in ext/standard/file.c - */ - + */ + /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index dbc786758b..b782536a57 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, read/write modes <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -18,8 +18,8 @@ Test fread() function : usage variations - read some/all chars, read/write modes include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -47,7 +47,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -65,7 +65,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation"); } - + $filename = dirname(__FILE__)."/fread_variation1.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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..9375b7a1db 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, write only mode <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -16,8 +16,8 @@ Test fread() function : usage variations - read some/all chars, write only mode include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -27,7 +27,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -46,7 +46,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -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..537b525f76 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™fread_variation", 3); } - + $filename = dirname(__FILE__)."/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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 2d2518a1c1..295663c539 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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 80a6caa626..5d66b54bec 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a+","a+b","a+t", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3); } - + $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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 288dcfc66c..6601f5aebc 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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 d3f3356b17..fb290b104c 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length @@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) { // print file pointer position before read var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - + // read the data of size $read_size echo "Reading $read_size bytes from file, expecting $expect_size bytes ... "; $data_from_file = fread($file_handle, $read_size); @@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) { return $data_from_file; } - + echo "*** Testing fread() : usage variations ***\n"; $file_modes = array("a","ab","at", @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) { /* create files with $file_content_type */ create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4); } - + $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files() echo "-- File opened in mode ".$file_mode." --\n"; $file_handle = fopen($filename, $file_mode); @@ -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.phpt b/ext/standard/tests/file/fscanf.phpt index 6d3d0a5b96..700439fcb5 100644 --- a/ext/standard/tests/file/fscanf.phpt +++ b/ext/standard/tests/file/fscanf.phpt @@ -63,7 +63,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fscanf.dat"; unlink($filename); ?> ---EXPECTF-- +--EXPECTF-- Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index fe351960dd..1a80d19348 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -13,7 +13,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_error.tmp"; $file_handle = fopen($filename, 'w'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); fwrite($file_handle, "hello world"); fclose($file_handle); @@ -23,7 +23,7 @@ var_dump( fscanf() ); // single argument $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle) ); fclose($file_handle); @@ -33,7 +33,7 @@ var_dump( fscanf($file_handle, "%s") ); // number of formats in format strings not matching the no of variables $file_handle = fopen($filename, 'r'); -if ($file_handle == false) +if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) ); fclose($file_handle); @@ -47,10 +47,10 @@ $invalid_formats = array( $undefined_var, undefined_constant, // looping to use various invalid formats with fscanf() foreach($invalid_formats as $format) { $file_handle = fopen($filename, 'r'); - if ($file_handle == false) + if ($file_handle == false) exit("Error:failed to open file $filename"); var_dump( fscanf($file_handle, $format) ); - fclose($file_handle); + fclose($file_handle); } echo "\n*** Done ***"; diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index 57b2918b1e..64d778916f 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -23,7 +23,7 @@ if($file_handle == false) @fwrite($file_handle, 12345); fclose($file_handle); -// open file for reading +// open file for reading $file_handle = fopen($filename, "r"); // capturing the return value from fscanf() called without third argument $return_value = fscanf($file_handle, "%s"); @@ -36,9 +36,9 @@ echo "\n*** Done ***"; <?php $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; -unlink($filename); +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_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index 9ab441610c..a46c112879 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with resource +Test fscanf() function: usage variations - float formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with resource ***\n"; +echo "*** Test fscanf(): different float format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation10.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt index 7b5168011f..27de2ae5df 100644 --- a/ext/standard/tests/file/fscanf_variation11.phpt +++ b/ext/standard/tests/file/fscanf_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with arrays +Test fscanf() function: usage variations - float formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with arrays ***\n"; +echo "*** Test fscanf(): different float format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation11.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation12.phpt b/ext/standard/tests/file/fscanf_variation12.phpt index 8968fc3397..33bfb67db0 100644 --- a/ext/standard/tests/file/fscanf_variation12.phpt +++ b/ext/standard/tests/file/fscanf_variation12.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with strings ***\n"; +echo "*** Test fscanf(): different float format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation12.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt index 89da5567f4..49525b484c 100644 --- a/ext/standard/tests/file/fscanf_variation13.phpt +++ b/ext/standard/tests/file/fscanf_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with boolean +Test fscanf() function: usage variations - float formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with boolean data ***\n"; +echo "*** Test fscanf(): different float format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation13.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt index a49e8391df..2b497c9f5b 100644 --- a/ext/standard/tests/file/fscanf_variation14.phpt +++ b/ext/standard/tests/file/fscanf_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with strings +Test fscanf() function: usage variations - string formats with strings --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with different string ***\n"; +echo "*** Test fscanf(): different string format types with different string ***\n"; // create a file $filename = "$file_path/fscanf_variation14.tmp"; @@ -65,7 +65,7 @@ $valid_strings = array( ); // various string formats -$string_formats = array( "%s", +$string_formats = array( "%s", "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", diff --git a/ext/standard/tests/file/fscanf_variation15.phpt b/ext/standard/tests/file/fscanf_variation15.phpt index a6dc720b91..76422dbc8c 100644 --- a/ext/standard/tests/file/fscanf_variation15.phpt +++ b/ext/standard/tests/file/fscanf_variation15.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with float values ***\n"; +echo "*** Test fscanf(): different string format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation15.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt index df4ebaa476..8025767bc1 100644 --- a/ext/standard/tests/file/fscanf_variation16.phpt +++ b/ext/standard/tests/file/fscanf_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with resource +Test fscanf() function: usage variations - string formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with resource ***\n"; +echo "*** Test fscanf(): different string format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation16.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt index 899d558057..2db8871c2b 100644 --- a/ext/standard/tests/file/fscanf_variation17.phpt +++ b/ext/standard/tests/file/fscanf_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with arrays +Test fscanf() function: usage variations - string formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with arrays ***\n"; +echo "*** Test fscanf(): different string format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation17.tmp"; @@ -37,7 +37,7 @@ $array_types = array ( ); $string_formats = array( "%s", - "%hs", "%ls", "%Ls", + "%hs", "%ls", "%Ls", " %s", "%s ", "% s", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s"); diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt index 5babc5479f..e80606a3fc 100644 --- a/ext/standard/tests/file/fscanf_variation18.phpt +++ b/ext/standard/tests/file/fscanf_variation18.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with integer values ***\n"; +echo "*** Test fscanf(): different string format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation18.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt index 0cf07076fe..08edc522b4 100644 --- a/ext/standard/tests/file/fscanf_variation19.phpt +++ b/ext/standard/tests/file/fscanf_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with boolean +Test fscanf() function: usage variations - string formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different string format types with boolean data ***\n"; +echo "*** Test fscanf(): different string format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation19.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index b500152460..6f8b4d9247 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with integer values +Test fscanf() function: usage variations - integer formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with different integer values ***\n"; +echo "*** Test fscanf(): different integer format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation2.tmp"; @@ -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 d8a28334f3..d59bef2ebd 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with integer values +Test fscanf() function: usage variations - char formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with different integer values ***\n"; +echo "*** Test fscanf(): different char format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation20.tmp"; @@ -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_variation21.phpt b/ext/standard/tests/file/fscanf_variation21.phpt index 42e05aaf04..51381ce479 100644 --- a/ext/standard/tests/file/fscanf_variation21.phpt +++ b/ext/standard/tests/file/fscanf_variation21.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with float values ***\n"; +echo "*** Test fscanf(): different char format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation21.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt index 50bb9e0d1d..a3809500a6 100644 --- a/ext/standard/tests/file/fscanf_variation22.phpt +++ b/ext/standard/tests/file/fscanf_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with resource +Test fscanf() function: usage variations - char formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with resource ***\n"; +echo "*** Test fscanf(): different char format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation22.tmp"; @@ -24,14 +24,14 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, $dfp ); -$char_formats = array( "%c", +$char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", "\t%c", "\n%c", "%4c", diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt index d429377e70..d536c28fde 100644 --- a/ext/standard/tests/file/fscanf_variation23.phpt +++ b/ext/standard/tests/file/fscanf_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with arrays +Test fscanf() function: usage variations - char formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with arrays ***\n"; +echo "*** Test fscanf(): different char format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation23.tmp"; @@ -39,7 +39,7 @@ $array_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt index 8be8354023..ddca007ccf 100644 --- a/ext/standard/tests/file/fscanf_variation24.phpt +++ b/ext/standard/tests/file/fscanf_variation24.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with strings ***\n"; +echo "*** Test fscanf(): different char format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation24.tmp"; @@ -43,9 +43,9 @@ $strings = array ( ); $char_formats = array( "%c", - "%hc", "%lc", "%Lc", + "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt index c8391d8388..d874aba45e 100644 --- a/ext/standard/tests/file/fscanf_variation25.phpt +++ b/ext/standard/tests/file/fscanf_variation25.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with boolean +Test fscanf() function: usage variations - char formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with boolean data ***\n"; +echo "*** Test fscanf(): different char format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation25.tmp"; @@ -31,7 +31,7 @@ $bool_types = array ( $char_formats = array( "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "% c", - "\t%c", "\n%c", "%4c", + "\t%c", "\n%c", "%4c", "%30c", "%[a-zA-Z@#$&0-9]", "%*c"); $counter = 1; diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt index 788427188c..1a883f479b 100644 --- a/ext/standard/tests/file/fscanf_variation26.phpt +++ b/ext/standard/tests/file/fscanf_variation26.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with chars +Test fscanf() function: usage variations - char formats with chars --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with chars $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different char format types with chars ***\n"; +echo "*** Test fscanf(): different char format types with chars ***\n"; // create a file $filename = "$file_path/fscanf_variation26.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 8982b73e2d..bbd201c543 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with integer values +Test fscanf() function: usage variations - octal formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with integer values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with different integer values ***\n"; +echo "*** Test fscanf(): different octal format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation27.tmp"; @@ -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_variation28.phpt b/ext/standard/tests/file/fscanf_variation28.phpt index c96377b027..97f72089fe 100644 --- a/ext/standard/tests/file/fscanf_variation28.phpt +++ b/ext/standard/tests/file/fscanf_variation28.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with float values ***\n"; +echo "*** Test fscanf(): different octal format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation28.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int @@ -41,7 +41,7 @@ $float_values = array ( ); $octal_formats = array( "%o", - "%ho", "%lo", "%Lo", + "%ho", "%lo", "%Lo", " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt index 80b52654db..ce7083bc08 100644 --- a/ext/standard/tests/file/fscanf_variation29.phpt +++ b/ext/standard/tests/file/fscanf_variation29.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with resource +Test fscanf() function: usage variations - octal formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with resource ***\n"; +echo "*** Test fscanf(): different octal format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation29.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, @@ -33,7 +33,7 @@ $resource_types = array ( $octal_formats = array( "%o", "%ho", "%lo", "%Lo", - " %o", "%o ", "% o", + " %o", "%o ", "% o", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt index 8ea8c8674a..8faff9d091 100644 --- a/ext/standard/tests/file/fscanf_variation3.phpt +++ b/ext/standard/tests/file/fscanf_variation3.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with float values ***\n"; +echo "*** Test fscanf(): different integer format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation3.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt index 7303454175..b4cb350ed6 100644 --- a/ext/standard/tests/file/fscanf_variation30.phpt +++ b/ext/standard/tests/file/fscanf_variation30.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with arrays +Test fscanf() function: usage variations - octal formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with arrays ***\n"; +echo "*** Test fscanf(): different octal format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation30.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation31.phpt b/ext/standard/tests/file/fscanf_variation31.phpt index 6ba47b6a51..f6bc7465f5 100644 --- a/ext/standard/tests/file/fscanf_variation31.phpt +++ b/ext/standard/tests/file/fscanf_variation31.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with strings ***\n"; +echo "*** Test fscanf(): different octal format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation31.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt index b1f0b248b5..52e45405d0 100644 --- a/ext/standard/tests/file/fscanf_variation32.phpt +++ b/ext/standard/tests/file/fscanf_variation32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with boolean +Test fscanf() function: usage variations - octal formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different octal format types with boolean data ***\n"; +echo "*** Test fscanf(): different octal format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation32.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index a01f5e761a..7263ffdf4a 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with integer values +Test fscanf() function: usage variations - hexa formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; +echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation33.tmp"; @@ -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_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt index 77437efc99..2acdc8ba1b 100644 --- a/ext/standard/tests/file/fscanf_variation34.phpt +++ b/ext/standard/tests/file/fscanf_variation34.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with float values ***\n"; +echo "*** Test fscanf(): different hexa format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation34.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt index 0e98f95022..1f98bd8f42 100644 --- a/ext/standard/tests/file/fscanf_variation35.phpt +++ b/ext/standard/tests/file/fscanf_variation35.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with resource +Test fscanf() function: usage variations - hexa formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with resource ***\n"; +echo "*** Test fscanf(): different hexa format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation35.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt index 3bf065fde0..44ff29536e 100644 --- a/ext/standard/tests/file/fscanf_variation36.phpt +++ b/ext/standard/tests/file/fscanf_variation36.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with arrays +Test fscanf() function: usage variations - hexa formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with arrays ***\n"; +echo "*** Test fscanf(): different hexa format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation36.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation37.phpt b/ext/standard/tests/file/fscanf_variation37.phpt index 43668fff4f..7ab302dd39 100644 --- a/ext/standard/tests/file/fscanf_variation37.phpt +++ b/ext/standard/tests/file/fscanf_variation37.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with strings ***\n"; +echo "*** Test fscanf(): different hexa format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation37.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt index 58327b867e..32a7f77b42 100644 --- a/ext/standard/tests/file/fscanf_variation38.phpt +++ b/ext/standard/tests/file/fscanf_variation38.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with boolean +Test fscanf() function: usage variations - hexa formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; +echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation38.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 42a8c515d8..1ed250c36c 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned int formats with integer values +Test fscanf() function: usage variations - unsigned int formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; +echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation39.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt index b1ceb085f3..0d9cd9dd43 100644 --- a/ext/standard/tests/file/fscanf_variation4.phpt +++ b/ext/standard/tests/file/fscanf_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with resource +Test fscanf() function: usage variations - integer formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with resource ***\n"; +echo "*** Test fscanf(): different integer format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation4.tmp"; @@ -25,7 +25,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt index 1324007561..f3a0c96a71 100644 --- a/ext/standard/tests/file/fscanf_variation40.phpt +++ b/ext/standard/tests/file/fscanf_variation40.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with float values ***\n"; +echo "*** Test fscanf(): different unsigned format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation40.tmp"; @@ -29,8 +29,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt index 507eac335c..080ce98054 100644 --- a/ext/standard/tests/file/fscanf_variation41.phpt +++ b/ext/standard/tests/file/fscanf_variation41.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with resource +Test fscanf() function: usage variations - unsigned formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with resource ***\n"; +echo "*** Test fscanf(): different unsigned format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation41.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt index fc8f8b89ca..978187c733 100644 --- a/ext/standard/tests/file/fscanf_variation42.phpt +++ b/ext/standard/tests/file/fscanf_variation42.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with arrays +Test fscanf() function: usage variations - unsigned formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; +echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation42.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation43.phpt b/ext/standard/tests/file/fscanf_variation43.phpt index e77ea08cfc..8a0052f122 100644 --- a/ext/standard/tests/file/fscanf_variation43.phpt +++ b/ext/standard/tests/file/fscanf_variation43.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with strings ***\n"; +echo "*** Test fscanf(): different unsigned format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation43.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt index fa51b5bca4..0b30b61f20 100644 --- a/ext/standard/tests/file/fscanf_variation44.phpt +++ b/ext/standard/tests/file/fscanf_variation44.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with boolean +Test fscanf() function: usage variations - unsigned formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; +echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation44.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 7795dd6cf4..2af39cb1c8 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with integer values +Test fscanf() function: usage variations - scientific formats with integer values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with integer value $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; +echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation45.tmp"; @@ -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_variation46.phpt b/ext/standard/tests/file/fscanf_variation46.phpt index c3cd8e0b7b..7145c8637a 100644 --- a/ext/standard/tests/file/fscanf_variation46.phpt +++ b/ext/standard/tests/file/fscanf_variation46.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with float values ***\n"; +echo "*** Test fscanf(): different scientific format types with float values ***\n"; // create a file $filename = "$file_path/fscanf_variation46.tmp"; @@ -23,8 +23,8 @@ if($file_handle == false) // array of float type values $float_values = array ( - -2147483649, - 2147483648, + -2147483649, + 2147483648, -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt index cf30d4b9c2..7010571a42 100644 --- a/ext/standard/tests/file/fscanf_variation47.phpt +++ b/ext/standard/tests/file/fscanf_variation47.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with resource +Test fscanf() function: usage variations - scientific formats with resource --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with resource $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with resource ***\n"; +echo "*** Test fscanf(): different scientific format types with resource ***\n"; // create a file $filename = "$file_path/fscanf_variation47.tmp"; @@ -24,7 +24,7 @@ if($file_handle == false) // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); - + // array of resource types $resource_types = array ( $fp, diff --git a/ext/standard/tests/file/fscanf_variation48.phpt b/ext/standard/tests/file/fscanf_variation48.phpt index b2412fa9b8..5b61e5b71e 100644 --- a/ext/standard/tests/file/fscanf_variation48.phpt +++ b/ext/standard/tests/file/fscanf_variation48.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with arrays +Test fscanf() function: usage variations - scientific formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with arrays ***\n"; +echo "*** Test fscanf(): different scientific format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation48.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation49.phpt b/ext/standard/tests/file/fscanf_variation49.phpt index a681cc01e3..4e314fb7ce 100644 --- a/ext/standard/tests/file/fscanf_variation49.phpt +++ b/ext/standard/tests/file/fscanf_variation49.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with strings ***\n"; +echo "*** Test fscanf(): different scientific format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation49.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt index a39d0b8ae1..750e604586 100644 --- a/ext/standard/tests/file/fscanf_variation5.phpt +++ b/ext/standard/tests/file/fscanf_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with arrays +Test fscanf() function: usage variations - integer formats with arrays --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with arrays $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with arrays ***\n"; +echo "*** Test fscanf(): different integer format types with arrays ***\n"; // create a file $filename = "$file_path/fscanf_variation5.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt index af406a147a..e46dbdb347 100644 --- a/ext/standard/tests/file/fscanf_variation50.phpt +++ b/ext/standard/tests/file/fscanf_variation50.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with boolean +Test fscanf() function: usage variations - scientific formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; +echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation50.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 46663364d0..0f5ab5a612 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file opened in write only mode +Test fscanf() function: usage variations - file opened in write only mode --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file opened in write only mode $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; +echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; // create a file $filename = "$file_path/fscanf_variation51.tmp"; @@ -39,7 +39,7 @@ $modes = array("w", "wb", "wt", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + $file_handle = fopen($filename, $mode); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt index 974ddef8f1..bf82ab8e43 100644 --- a/ext/standard/tests/file/fscanf_variation52.phpt +++ b/ext/standard/tests/file/fscanf_variation52.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - empty file +Test fscanf() function: usage variations - empty file --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - empty file $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read an empty file ***\n"; +echo "*** Test fscanf(): to read an empty file ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,7 +28,7 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation52.tmp"; $file_handle = fopen($filename, "w"); diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt index 3cd273488d..a553a96693 100644 --- a/ext/standard/tests/file/fscanf_variation53.phpt +++ b/ext/standard/tests/file/fscanf_variation53.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file pointer pointing to EOF +Test fscanf() function: usage variations - file pointer pointing to EOF --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file pointer pointing to EOF $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; +echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; // various formats $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); @@ -28,16 +28,16 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t", $counter = 1; // reading the values from file using different integer formats foreach($modes as $mode) { - + // create an empty file $filename = "$file_path/fscanf_variation53.tmp"; $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); - + //writing data to the file @fwrite($file_handle, "Sample text\n"); - + // writing a blank line @fwrite($file_handle, "\n"); @@ -50,14 +50,14 @@ foreach($modes as $mode) { exit("Error:failed to open file $filename"); } echo "\n-- iteration $counter --\n"; - + // current location var_dump( ftell($file_handle) ); - + // set the file pointer to eof var_dump( fseek($file_handle, 0, SEEK_END) ); - - // current location + + // current location var_dump( ftell($file_handle) ); foreach($formats as $format) { diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt index 72ba7c84a2..0937e5b556 100644 --- a/ext/standard/tests/file/fscanf_variation54.phpt +++ b/ext/standard/tests/file/fscanf_variation54.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - objects $file_path = dirname(__FILE__); -echo "*** Test fscanf(): to read objects from a file ***\n"; +echo "*** Test fscanf(): to read objects from a file ***\n"; // declare a class class foo @@ -43,7 +43,7 @@ $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); $counter = 1; -// opening file for read +// opening file for read $file_handle = fopen($filename, "r"); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index ec65ec4236..a0f9b709e8 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - tracking file pointer while reading +Test fscanf() function: usage variations - tracking file pointer while reading --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -21,7 +21,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; +echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; // create a file $filename = "$file_path/fscanf_variation55.tmp"; @@ -32,17 +32,17 @@ if($file_handle == false) // different valid data $valid_data = array( 12345, // integer value - -12345, + -12345, 123.45, // float value - -123.45, + -123.45, 0x123B, // hexadecimal value 0x12ab, 0123, // octal value - -0123, + -0123, "abcde", // string 'abcde', 10e3, // exponential value - 10e-3 + 10e-3 ); // various formats $int_formats = array( "%d", "%f", "%s", "%o", "%x", "%u", "%c", "%e"); @@ -72,14 +72,14 @@ foreach($modes as $mode) { // reading different data from file using different formats foreach($int_formats as $int_format) { // current file pointer position - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); // rewind the file so that for every foreach iteration the file pointer starts from bof rewind($file_handle); // current file pointer position after rewind operation - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); echo "\n-- iteration $counter --\n"; while( !feof($file_handle) ) { - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( fscanf($file_handle,$int_format) ); } $counter++; @@ -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_variation6.phpt b/ext/standard/tests/file/fscanf_variation6.phpt index 0a6c908b2d..74446f0851 100644 --- a/ext/standard/tests/file/fscanf_variation6.phpt +++ b/ext/standard/tests/file/fscanf_variation6.phpt @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with strings $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with strings ***\n"; +echo "*** Test fscanf(): different integer format types with strings ***\n"; // create a file $filename = "$file_path/fscanf_variation6.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt index 6466193820..33354e7faa 100644 --- a/ext/standard/tests/file/fscanf_variation7.phpt +++ b/ext/standard/tests/file/fscanf_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with boolean +Test fscanf() function: usage variations - integer formats with boolean --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with boolean $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different integer format types with boolean data ***\n"; +echo "*** Test fscanf(): different integer format types with boolean data ***\n"; // create a file $filename = "$file_path/fscanf_variation7.tmp"; diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index 25958dc70d..97241015e6 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with float values +Test fscanf() function: usage variations - float formats with float values --FILE-- <?php @@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with float values $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with different float values ***\n"; +echo "*** Test fscanf(): different float format types with different float values ***\n"; // create a file $filename = "$file_path/fscanf_variation8.tmp"; @@ -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 @@ -55,7 +55,7 @@ $valid_floats = array( ); // various float formats -$float_formats = array( "%f", +$float_formats = array( "%f", "%hf", "%lf", "%Lf", " %f", "%f ", "% f", "\t%f", "\n%f", "%4f", diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt index 331d8f9c2f..e4cc6fa3b3 100644 --- a/ext/standard/tests/file/fscanf_variation9.phpt +++ b/ext/standard/tests/file/fscanf_variation9.phpt @@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) { $file_path = dirname(__FILE__); -echo "*** Test fscanf(): different float format types with integer values ***\n"; +echo "*** Test fscanf(): different float format types with integer values ***\n"; // create a file $filename = "$file_path/fscanf_variation9.tmp"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index 7167504ce8..4a14b334b6 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -42,7 +42,7 @@ foreach($file_content_types as $file_content_type){ // set the file pointer to 0 var_dump( rewind($file_handle) ); // Confirm file pointer moves correctly var_dump( ftell($file_handle) ); // confirm the file pointer position - + foreach($whence_set as $whence){ echo "-- Testing fseek() with whence = $whence_string[$whence] --\n"; var_dump( fseek($file_handle,10,$whence) ); //expecting int(0) @@ -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 e1ceb79c94..fda4de5f40 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 @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ @@ -71,7 +71,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 80c465d475..58bb65ef86 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -24,7 +24,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ @@ -71,7 +71,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..6974b5262e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -23,7 +23,7 @@ include ("file.inc"); /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */ echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array("text_with_new_line","alphanumeric"); @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ @@ -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..8e01b8408b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fseek(), ftell() & rewind() functions : error conditions - fseek() +Test fseek(), ftell() & rewind() functions : error conditions - fseek() --FILE-- <?php @@ -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..5c96fa0275 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -15,9 +15,9 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all r and a modes ***\n"; $file_modes = array( "r","rb","rt","r+","r+b","r+t", @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle, $count) ); + var_dump( fseek($file_handle, $count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..e30a6bba06 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..4957868723 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; -$file_modes = array( "w","wb","wt","w+","w+b","w+t", +$file_modes = array( "w","wb","wt","w+","w+b","w+t", "x","xb","xt","x+","x+b","x+t"); $file_content_types = array( "text_with_new_line","alphanumeric"); @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){ echo "-- Testing fseek() without using argument whence --\n"; foreach($offset as $count){ - var_dump( fseek($file_handle,$count) ); + var_dump( fseek($file_handle,$count) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..7dc9256340 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_SET */ @@ -45,7 +45,7 @@ foreach($file_content_types as $file_content_type){ exit(); } foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..aa6e5f4104 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..71573087ee 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_SET) ); + var_dump( fseek($file_handle,$count,SEEK_SET) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..ff1d8c8710 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/fseek_ftell_rewind_variation5.tmp"; // this is n /* open the file using $files_modes and perform fseek(),ftell() and rewind() on it */ foreach($file_content_types as $file_content_type){ echo "-- File having data of type ". $file_content_type ." --\n"; - + foreach($file_modes as $file_mode) { echo "-- File opened in mode ".$file_mode." --\n"; create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 512, "w", "fseek_ftell_rewind_variation" @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..02c230f819 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..18821c86f2 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_CUR) ); + var_dump( fseek($file_handle,$count,SEEK_CUR) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop @@ -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..49deec5a15 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_END */ @@ -44,11 +44,11 @@ foreach($file_content_types as $file_content_type){ } rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size, the size will have increased // by 10 bytes because of holes fclose($file_handle); @@ -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..2503422195 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); @@ -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..144d9f6d1b 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; @@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){ rewind($file_handle); foreach($offset as $count){ - var_dump( fseek($file_handle,$count,SEEK_END) ); + var_dump( fseek($file_handle,$count,SEEK_END) ); var_dump( ftell($file_handle) ); // confirm the file pointer position var_dump( feof($file_handle) ); //ensure that file pointer is not at end } //end of offset loop - + //close the file and check the size fclose($file_handle); var_dump( filesize($filename) ); @@ -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 ec698a4108..dda12bc704 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ @@ -62,9 +62,9 @@ $values = array( // string data "string", 'string', - + // object data - new testClass(), + new testClass(), // undefined data $undefined_var, @@ -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 3a5cd9db7c..48fe1802a8 100644 --- a/ext/standard/tests/file/fseek_variation2.phpt +++ b/ext/standard/tests/file/fseek_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ @@ -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..99d6077b41 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fseek() function : variation functionality beyond file boundaries +Test fseek() function : variation functionality beyond file boundaries --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ @@ -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.phpt b/ext/standard/tests/file/fstat.phpt index 94ba9c5abf..96924af077 100644 --- a/ext/standard/tests/file/fstat.phpt +++ b/ext/standard/tests/file/fstat.phpt @@ -13,7 +13,7 @@ var_dump(fstat($fp)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(26) { [0]=> int(%i) diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt index c3c15295dd..d75ddb9a76 100644 --- a/ext/standard/tests/file/fstat_error.phpt +++ b/ext/standard/tests/file/fstat_error.phpt @@ -3,7 +3,7 @@ Test function fstat() by calling it more than or less than its expected argument --FILE-- <?php $fp = fopen (__FILE__, 'r'); -$extra_arg = 'nothing'; +$extra_arg = 'nothing'; var_dump(fstat( $fp, $extra_arg ) ); var_dump(fstat()); diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt index 6368c3b849..e2aa865874 100644 --- a/ext/standard/tests/file/fstat_variation2.phpt +++ b/ext/standard/tests/file/fstat_variation2.phpt @@ -17,15 +17,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===
\ No newline at end of file diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt index 6f98da81e7..6478b39377 100644 --- a/ext/standard/tests/file/fstat_variation5.phpt +++ b/ext/standard/tests/file/fstat_variation5.phpt @@ -17,15 +17,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===
\ No newline at end of file diff --git a/ext/standard/tests/file/ftruncate.phpt b/ext/standard/tests/file/ftruncate.phpt Binary files differindex 67b070c836..acc4e8afa3 100644 --- a/ext/standard/tests/file/ftruncate.phpt +++ b/ext/standard/tests/file/ftruncate.phpt 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_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 112a1ce6e8..31fc60fd17 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -17,18 +17,18 @@ echo "\n Initial file size = ".filesize($filename)."\n"; echo "-- Testing ftruncate() with less than expected number of arguments --\n"; -// zero arguments +// zero arguments var_dump( ftruncate() ); // arguments less than expected numbers var_dump( ftruncate( $file_handle ) ); -// check the first size +// check the first size var_dump( filesize($filename) ); echo "-- Testing ftruncate() with more than expected number of arguments --\n"; -// more than expected number of arguments +// more than expected number of arguments var_dump( ftruncate($file_handle, 10, 20) ); -// check the first size +// check the first size var_dump( filesize($filename) ); // test invalid arguments : non-resources @@ -53,18 +53,18 @@ echo "-- Testing ftruncate() with closed/unset file handle --\n"; // ftruncate on close file handle fclose($file_handle); var_dump( ftruncate($file_handle,10) ); -// check the first size +// check the first size var_dump( filesize($filename) ); // ftruncate on a file handle which is unset $fp = fopen($filename, "w"); unset($fp); //unset file handle var_dump( ftruncate(@$fp,10)); -// check the first size +// check the first size var_dump( filesize($filename) ); echo "Done\n"; -?> +?> --CLEAN-- <?php $filename = dirname(__FILE__)."/ftruncate_error.tmp"; @@ -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..e097b342f4 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,13 +62,13 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//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..58dfd296ed 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,13 +62,13 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//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..c6d28d7e6d 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,13 +62,13 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//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..6d62f75f1a 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -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..2b907f595b 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation2.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -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..4eba4a7a08 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -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..27fbe33bbc 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): truncate file to half of its current size --\n"; - /* truncate it to half of its current size */ + /* truncate it to half of its current size */ $new_size = filesize($filename)/2; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -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_variation4-win32.phpt b/ext/standard/tests/file/ftruncate_variation4-win32.phpt index 18d5138baf..5bf5f679b6 100644 --- a/ext/standard/tests/file/ftruncate_variation4-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation4-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation4.phpt b/ext/standard/tests/file/ftruncate_variation4.phpt index 077b46fd05..ef0ee21996 100644 --- a/ext/standard/tests/file/ftruncate_variation4.phpt +++ b/ext/standard/tests/file/ftruncate_variation4.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) { echo "-- Testing ftruncate(): try truncating file to a negative size --\n"; /* try to truncate it to a negative size, size should not change*/ - $new_size = -1000; + $new_size = -1000; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); var_dump( ftruncate($file_handle, $new_size) ); // truncate it diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index 4415cf54e8..64bed969c9 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop @@ -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..0716693cd1 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -19,7 +19,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) { for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n"; - + // create 1 file with some contents $filename = dirname(__FILE__)."/ftruncate_variation5.tmp"; if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) { @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { fclose($file_handle); clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // new file size = actual size, no change - + //delete all files created delete_file($filename); }//end of inner for loop @@ -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..4b88ee8dd6 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,15 +66,15 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop }//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..69dee82b70 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -21,7 +21,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } rewind($file_handle); // file pointer to 0 - + echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n"; /* try to truncate it and display the file content */ - + $new_size = 15; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -66,15 +66,15 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file( $filename ); }//end of inner for loop }//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..09158ca490 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } - rewind($file_handle); // file pointer to 0 - + rewind($file_handle); // file pointer to 0 + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,15 +62,15 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop }//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..0ee558f0f9 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -20,7 +20,7 @@ include ("file.inc"); echo "*** Testing ftruncate() : usage variations ***\n"; /* test ftruncate with file opened in different modes */ -$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", +$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", "w", "wb", "wt", "w+", "w+b", "w+t", "x", "xb", "xt", "x+", "x+b", "x+t", "a", "ab", "at", "a+", "a+b", "a+t"); @@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) { $file_handle = fopen($filename, $file_modes[$mode_counter]); } if (!$file_handle) { - echo "Error: failed to open file $filename!\n"; + echo "Error: failed to open file $filename!\n"; exit(); } - rewind($file_handle); // file pointer to 0 - + rewind($file_handle); // file pointer to 0 + echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ - fseek($file_handle, 0, SEEK_END); + fseek($file_handle, 0, SEEK_END); $new_size = 200; var_dump( filesize($filename) ); // current filesize var_dump( ftell($file_handle) ); @@ -62,15 +62,15 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); fclose($file_handle); clearstatcache(); // clear previous size value in cache - var_dump( filesize($filename) ); - + var_dump( filesize($filename) ); + //delete all files created delete_file($filename); }//end of inner for loop }//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.phpt b/ext/standard/tests/file/fwrite.phpt index 443710b99d..7f12ebb1ee 100644 --- a/ext/standard/tests/file/fwrite.phpt +++ b/ext/standard/tests/file/fwrite.phpt @@ -29,7 +29,7 @@ var_dump(file_get_contents($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d bool(false) diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index e3bb39a62b..cdc5d86ff9 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop @@ -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 52d3d033c1..d21887873e 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic-win32.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop @@ -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 e11606ade3..b0cb93212b 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) { echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n"; $filename = dirname(__FILE__)."/fwrite_basic.tmp"; // this is name of the file - for($inner_loop_counter = 0; - $inner_loop_counter < count($file_modes); + for($inner_loop_counter = 0; + $inner_loop_counter < count($file_modes); $inner_loop_counter++) { echo "-- File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n"; /* open the file using $files_modes and perform fwrite() on it */ @@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100) var_dump( feof($file_handle) ); // expected : false var_dump( ftell($file_handle) ); //expected: 100 - + // trying to write more than the available data, available 1024 bytes but trying 2048 var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024) var_dump( feof($file_handle) ); // expected : false @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop @@ -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 6af00e1121..1e17b5d117 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -19,7 +19,7 @@ $filename = dirname(__FILE__)."/fwrite_error.tmp"; echo "-- Testing fwrite() with less than expected number of arguments --\n"; // zero argument -var_dump( fwrite() ); +var_dump( fwrite() ); // less than expected, 1 arg $file_handle = fopen ( $filename, "w"); var_dump( fwrite($file_handle) ); @@ -52,14 +52,14 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) { var_dump( fwrite($invalid_args[$loop_counter - 1], 10) ); } -// fwrite() on a file handle which is already closed +// fwrite() on a file handle which is already closed echo "-- Testing fwrite() with closed/unset file handle --\n"; fclose($file_handle); var_dump(fwrite($file_handle,"data")); -// fwrite on a file handle which is unset +// fwrite on a file handle which is unset $fp = fopen($filename, "w"); -unset($fp); //unset file handle +unset($fp); //unset file handle var_dump( fwrite(@$fp,"data")); echo "Done\n"; @@ -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..79a5cf1d9c 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ @@ -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..644e71c44b 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ @@ -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..f6cf927621 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -36,7 +36,7 @@ foreach($file_content_types as $file_content_type) { /* open the file using $files_modes and perform fwrite() on it */ foreach($file_modes as $file_mode) { echo "-- Opening file in $file_mode --\n"; - + // create the temp file with content of type $file_content_type $filename = dirname(__FILE__)."/fwrite_variation1.tmp"; // this is name of the file create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fwrite_variation"); @@ -50,14 +50,14 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ var_dump( ftell($file_handle) ); // expected: 0 - var_dump( fwrite($file_handle, $data_to_be_written )); + var_dump( fwrite($file_handle, $data_to_be_written )); var_dump( ftell($file_handle) ); // expected: 0 - var_dump( feof($file_handle) ); // expected: false - + var_dump( feof($file_handle) ); // expected: false + // move the file pointer to end of the file and try fwrite() fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expecting 1024 @@ -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..a2e2d8d9e9 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ @@ -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..47a352e28a 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ @@ -61,14 +61,14 @@ foreach($file_content_types as $file_content_type) { var_dump( feof($file_handle) ); //Expecting bool(false) /*overwrite data in middle of the file*/ - fseek($file_handle, SEEK_SET, 1024/2 ); + fseek($file_handle, SEEK_SET, 1024/2 ); var_dump( ftell($file_handle)); // expected: 1024/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) /* write at the end of the file */ - fseek($file_handle, SEEK_END, 0); + fseek($file_handle, SEEK_END, 0); var_dump( ftell($file_handle) ); // expected: 1024 var_dump( feof($file_handle) ); var_dump( fwrite($file_handle, $data_to_be_written, 200) ); @@ -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..b04ffd75ba 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer var_dump( ftell($file_handle) ); // expected: 1024 @@ -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..ca60ef438e 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer @@ -64,9 +64,9 @@ foreach($file_content_types as $file_content_type) { fseek($file_handle, SEEK_SET, (1024 + 400)/2 ); var_dump( ftell($file_handle)); // expected: (1024 + 400)/2 var_dump( fwrite($file_handle, $data_to_be_written, 200) ); - var_dump( ftell($file_handle) ); + var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); //Expecting bool(false) - + /* check the filesize and display file content */ // close the file, get the size and content of the file. var_dump( fclose($file_handle) ); @@ -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..247ee4e13a 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); @@ -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..701950dc65 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); @@ -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_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt index 7afa91216e..b12af3182b 100644 --- a/ext/standard/tests/file/fwrite_variation5.phpt +++ b/ext/standard/tests/file/fwrite_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fwrite() function : usage variation +Test fwrite() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int fwrite(resource fp, string str [, int length]) - * Description: Binary-safe file write + * Description: Binary-safe file write * Source code: ext/standard/file.c * Alias to functions: bzwrite fputs gzwrite */ diff --git a/ext/standard/tests/file/get_current_user.phpt b/ext/standard/tests/file/get_current_user.phpt index f23d2fabef..b67195b629 100644 --- a/ext/standard/tests/file/get_current_user.phpt +++ b/ext/standard/tests/file/get_current_user.phpt @@ -8,7 +8,7 @@ var_dump(get_current_user()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d NULL string(%d) %s 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/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index ecd47f418e..05b16238cd 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -8,7 +8,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD' EOD; /*<?*/ -class mystream +class mystream { public $path; public $mode; @@ -20,7 +20,7 @@ class mystream function url_stat($path, $flags) { return array(); } - + function stream_stat() { return array(); } @@ -32,7 +32,7 @@ class mystream $this->options = $options; $split = parse_url($path); - if ($split["host"] !== "GLOBALS" || + if ($split["host"] !== "GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; @@ -43,7 +43,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_001.phpt b/ext/standard/tests/file/include_userstream_001.phpt index d769a4f3b2..d805afd204 100644 --- a/ext/standard/tests/file/include_userstream_001.phpt +++ b/ext/standard/tests/file/include_userstream_001.phpt @@ -15,7 +15,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index cc1887c446..4841d39c51 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 470982d9b8..2b439cfa25 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -20,7 +20,7 @@ class test { $this->pos = strlen($this->data); else $this->po = 0; - + return true; } diff --git a/ext/standard/tests/file/is_dir_basic.phpt b/ext/standard/tests/file/is_dir_basic.phpt index 7265d50e6d..c3d659b564 100644 --- a/ext/standard/tests/file/is_dir_basic.phpt +++ b/ext/standard/tests/file/is_dir_basic.phpt @@ -31,7 +31,7 @@ $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_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt index 76b8e8bc0c..65efeab9a1 100644 --- a/ext/standard/tests/file/is_dir_variation2.phpt +++ b/ext/standard/tests/file/is_dir_variation2.phpt @@ -24,14 +24,14 @@ mkdir($dirname); var_dump( is_dir($dirname) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink"); -var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks +var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks clearstatcache(); echo "-- With hardlink --"; link($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_link"); //Not permitted to create hard-link to a dir -var_dump( is_dir($file_path."/is_dir_variation2_link") ); +var_dump( is_dir($file_path."/is_dir_variation2_link") ); clearstatcache(); echo "\n*** Testing is_dir() with file and links to a file ***\n"; @@ -41,7 +41,7 @@ fclose( fopen($filename, "w") ); var_dump( is_dir($filename) ); clearstatcache(); -echo "-- With symlink --\n"; +echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2.tmp", $file_path."/is_dir_variation2_symlink.tmp"); var_dump( is_dir($file_path."/is_dir_variation2_symlink.tmp") ); clearstatcache(); diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt index 2070374117..41826ad7ec 100644 --- a/ext/standard/tests/file/is_dir_variation3.phpt +++ b/ext/standard/tests/file/is_dir_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- <?php /* Prototype: bool is_dir ( string $dirname ); 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..a93cd6920c 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/is_executable.tmp"; create_file($filename); $counter = 1; -/* loop to check if the file with new mode is executable +/* loop to check if the file with new mode is executable using is_executable() */ for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Changing mode of file to $mode --\n"; @@ -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_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt index 1cd0a8d209..231f1bff3f 100644 --- a/ext/standard/tests/file/is_executable_variation1.phpt +++ b/ext/standard/tests/file/is_executable_variation1.phpt @@ -35,19 +35,19 @@ $files_arr = array( /* Testing file with double slashes */ "$file_path/is_executable_variation1//bar.tmp", "$file_path/is_executable_variation1/*.tmp", - "$file_path/is_executable_variation1/b*.tmp", + "$file_path/is_executable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_executable_variation1".chr(0)."bar.temp", "$file_path".chr(0)."is_executable_variation1/bar.temp", "$file_path/is_executable_variation1x000/", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_executable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index fe9cb8f366..6edd2dd744 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -5,7 +5,7 @@ Test is_executable() function: usage variations - file/dir with diff. perms if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip not for windows'); } -// Skip if being run by root +// Skip if being run by root $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; $fp = fopen($filename, 'w'); fclose($fp); @@ -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_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt index b9f734d448..925f9963c0 100644 --- a/ext/standard/tests/file/is_executable_variation3.phpt +++ b/ext/standard/tests/file/is_executable_variation3.phpt @@ -41,7 +41,7 @@ $invalid_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach( $invalid_files as $invalid_file ) { var_dump( is_executable($invalid_file) ); 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..e3c230b26c 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -7,7 +7,7 @@ Test is_file() function: usage variations - diff. files Returns TRUE if the filename exists and is a regular file */ -/* Testing is_file() with file containing data, truncating its size +/* Testing is_file() with file containing data, truncating its size and the file created by touch() */ $file_path = dirname(__FILE__); @@ -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 cbe15ada71..7ab44da7ff 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Returns TRUE if the filename exists and is a regular file */ -/* Creating soft and hard links to a file and applying is_file() on links */ +/* Creating soft and hard links to a file and applying is_file() on links */ $file_path = dirname(__FILE__); fclose( fopen($file_path."/is_file_variation2.tmp", "w") ); @@ -38,7 +38,7 @@ 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_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt index 6a6d76f793..2a13e46779 100644 --- a/ext/standard/tests/file/is_file_variation3.phpt +++ b/ext/standard/tests/file/is_file_variation3.phpt @@ -22,12 +22,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( is_file($filename) ); diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt index 505331d2c9..b927446b7c 100644 --- a/ext/standard/tests/file/is_file_variation4.phpt +++ b/ext/standard/tests/file/is_file_variation4.phpt @@ -27,7 +27,7 @@ $files_arr = array( "/is_file_variation4//is_file_variation4.tmp", "//is_file_variation4//is_file_variation4.tmp", "/is_file_variation4/*.tmp", - "is_file_variation4/is_file*.tmp", + "is_file_variation4/is_file*.tmp", /* Testing Binary safe */ "/is_file_variation4/is_file_variation4.tmp".chr(0), 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_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt index 0ba2324f9a..5becac00a2 100644 --- a/ext/standard/tests/file/is_readable_variation1.phpt +++ b/ext/standard/tests/file/is_readable_variation1.phpt @@ -44,19 +44,19 @@ $files_arr = array( "$file_path/is_readable_variation1//bar.tmp", "$file_path//is_readable_variation1//bar.tmp", "$file_path/is_readable_variation1/*.tmp", - "$file_path/is_readable_variation1/b*.tmp", + "$file_path/is_readable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_readable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", "$file_path".chr(0)."is_readable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_readable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; 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_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt index 3de5f1623e..dc4d3b16f3 100644 --- a/ext/standard/tests/file/is_readable_variation3.phpt +++ b/ext/standard/tests/file/is_readable_variation3.phpt @@ -40,7 +40,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a readable file */ foreach( $misc_files as $misc_file ) { var_dump( is_readable($misc_file) ); 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_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt index f5cdf6a8a0..718c7fb8e9 100644 --- a/ext/standard/tests/file/is_writable_variation1.phpt +++ b/ext/standard/tests/file/is_writable_variation1.phpt @@ -46,19 +46,19 @@ $files_arr = array( "$file_path/is_writable_variation1//bar.tmp", "$file_path//is_writable_variation1//bar.tmp", "$file_path/is_writable_variation1/*.tmp", - "$file_path/is_writable_variation1/b*.tmp", + "$file_path/is_writable_variation1/b*.tmp", /* Testing Binary safe */ "$file_path/is_writable_variation1".chr(0)."bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", "$file_path".chr(0)."is_writable_variation1/bar.tmp", - + /* Testing directories */ ".", // current directory, exp: bool(true) "$file_path/is_writable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; 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/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt index 6b79934760..66a80abf1e 100644 --- a/ext/standard/tests/file/is_writable_variation3.phpt +++ b/ext/standard/tests/file/is_writable_variation3.phpt @@ -38,7 +38,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach( $misc_files as $misc_file ) { var_dump( is_writable($misc_file) ); 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..57476131c7 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : basic functionality +Test lchown() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); @@ -10,7 +10,7 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()"); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : basic functionality ***\n"; @@ -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/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt index f4b4f5089e..8632495b39 100644 --- a/ext/standard/tests/file/lchown_error.phpt +++ b/ext/standard/tests/file/lchown_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : error functionality +Test lchown() function : error functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); @@ -19,7 +19,7 @@ unlink($filename); /* Prototype : bool lchown (string filename, mixed user) * Description: Change file owner of a symlink * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing lchown() : error functionality ***\n"; diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt index ec11e2f839..0d1476d68d 100644 --- a/ext/standard/tests/file/lstat_stat_basic.phpt +++ b/ext/standard/tests/file/lstat_stat_basic.phpt @@ -54,8 +54,8 @@ sleep(2); $new_file_stat = stat($filename); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat() and lstat() : validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true @@ -66,7 +66,7 @@ var_dump( compare_self_stat($link_stat) ); // expect true var_dump( compare_self_stat($new_file_stat) ); //expect true var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating files and link, also dump the value of stats echo "*** Testing stat() and lstat() : comparing stats (recorded before and after file/link creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt index 8f290a32e3..385167fe32 100644 --- a/ext/standard/tests/file/lstat_stat_error.phpt +++ b/ext/standard/tests/file/lstat_stat_error.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing lstat() for error conditions ***\n"; -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); var_dump( lstat() ); // args < expected var_dump( lstat(__FILE__, 2) ); // args > expected var_dump( lstat("$file_path/temp.tmp") ); // non existing file diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index 9335ce9ef8..cf8213a8e4 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -34,11 +34,11 @@ clearstatcache(); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); @@ -51,7 +51,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 51ebc25e71..fe36697237 100644 --- a/ext/standard/tests/file/lstat_stat_variation10.phpt +++ b/ext/standard/tests/file/lstat_stat_variation10.phpt @@ -49,7 +49,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 a75504b479..08a51c8423 100644 --- a/ext/standard/tests/file/lstat_stat_variation11.phpt +++ b/ext/standard/tests/file/lstat_stat_variation11.phpt @@ -50,7 +50,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 f9413f768f..3051210001 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of is_link() +Test lstat() and stat() functions: usage variations - effects of is_link() --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); @@ -56,7 +56,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 17b6262a52..e190f465aa 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - file opened using w and r mode +Test lstat() and stat() functions: usage variations - file opened using w and r mode --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); @@ -49,7 +49,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 41106a80fc..a515058421 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - hardlink +Test lstat() and stat() functions: usage variations - hardlink --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -28,7 +28,7 @@ fclose($fp); echo "*** Checking lstat() and stat() on hard link ***\n"; $linkname = "$file_path/lstat_stat_variation14_hard.tmp"; -//ensure that link doesn't exists +//ensure that link doesn't exists @unlink($linkname); // create the link @@ -52,7 +52,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 8b67338abb..6a8dcb7146 100644 --- a/ext/standard/tests/file/lstat_stat_variation15.phpt +++ b/ext/standard/tests/file/lstat_stat_variation15.phpt @@ -54,7 +54,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 9f1276548f..31c0e13ee6 100644 --- a/ext/standard/tests/file/lstat_stat_variation16.phpt +++ b/ext/standard/tests/file/lstat_stat_variation16.phpt @@ -48,7 +48,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 f2306de792..78d4090870 100644 --- a/ext/standard/tests/file/lstat_stat_variation17.phpt +++ b/ext/standard/tests/file/lstat_stat_variation17.phpt @@ -47,7 +47,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_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt index 4ac01f2035..6ee563d684 100644 --- a/ext/standard/tests/file/lstat_stat_variation18.phpt +++ b/ext/standard/tests/file/lstat_stat_variation18.phpt @@ -38,15 +38,15 @@ class names { // directory name stored in an object $dir_name = new names("$file_path/lstat_stat_variation18"); -// file name stored in an object +// file name stored in an object $file_name = new names("$file_path/lstat_stat_variation18.tmp"); echo "\n-- Testing stat() on filename stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($file_name->var_name) ); echo "\n-- Testing stat() on directory name stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($dir_name->var_name) ); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt index fedf0bd154..c481575ce9 100644 --- a/ext/standard/tests/file/lstat_stat_variation19.phpt +++ b/ext/standard/tests/file/lstat_stat_variation19.phpt @@ -32,7 +32,7 @@ echo "*** Testing stat() with filename & directory name stored inside an array * // array with default numeric index $names = array( - "$file_path/lstat_stat_variation19.tmp", + "$file_path/lstat_stat_variation19.tmp", "$file_path/lstat_stat_variation19" ); diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index aaf77b9e3d..9f9e75ba2b 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -37,7 +37,7 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); // compare the two stats - all except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); @@ -52,7 +52,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_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt index ad0f586f1b..8dcd70c798 100644 --- a/ext/standard/tests/file/lstat_stat_variation20.phpt +++ b/ext/standard/tests/file/lstat_stat_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - link names stored in array/object +Test lstat() and stat() functions: usage variations - link names stored in array/object --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -37,8 +37,8 @@ class names { // link name stored in an object $link_object = new names("$file_path/lstat_stat_variation20_link.tmp"); -// link name stored in side an array -// with default numeric key +// link name stored in side an array +// with default numeric key $link_array = array("$file_path/lstat_stat_variation20_link.tmp"); // with string key index diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt index 8620ab00d7..833cf1dabb 100644 --- a/ext/standard/tests/file/lstat_stat_variation21.phpt +++ b/ext/standard/tests/file/lstat_stat_variation21.phpt @@ -55,7 +55,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_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt index 43f8bf6187..e7bae3abb4 100644 --- a/ext/standard/tests/file/lstat_stat_variation3.phpt +++ b/ext/standard/tests/file/lstat_stat_variation3.phpt @@ -41,7 +41,7 @@ var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); // compare the two stats - all except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt index 259beca006..1fccb95816 100644 --- a/ext/standard/tests/file/lstat_stat_variation4.phpt +++ b/ext/standard/tests/file/lstat_stat_variation4.phpt @@ -55,7 +55,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 9e03e5c7d9..b828c855a3 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -26,7 +26,7 @@ require "$file_path/file.inc"; /* create temp directory */ $dir_name = "$file_path/lstat_stat_variation5"; -@rmdir($dir_name); //ensure that dir doesn't exists +@rmdir($dir_name); //ensure that dir doesn't exists mkdir($dir_name); // temp dir // touch a directory and check stat, there should be difference in atime @@ -56,7 +56,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 ea2b92f975..3d5cc218ab 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of touch() on link +Test lstat() and stat() functions: usage variations - effects of touch() on link --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); @@ -69,7 +69,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 5a1e1c3994..8aa11a3443 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -48,7 +48,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..d799befd60 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats with creating file/subdir in a dir +/* test the effects on stats with creating file/subdir in a dir */ /* create temp file */ @@ -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 4d9e52f903..3c30ae914e 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats by deleting file/subdir from a dir +/* test the effects on stats by deleting file/subdir from a dir */ echo "*** Testing stat() for comparing stats after the deletion of subdir and file ***\n"; @@ -59,7 +59,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..23823b2ae7 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-002.phpt b/ext/standard/tests/file/mkdir-002.phpt index 92c05e941d..d149098df0 100644 --- a/ext/standard/tests/file/mkdir-002.phpt +++ b/ext/standard/tests/file/mkdir-002.phpt @@ -30,7 +30,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-002")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) string(%d) "%s diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index dde6b35550..fe14bef23d 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..51e4e55617 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..161f8d0630 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_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt index cee03858cb..17f54926cb 100644 --- a/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php.net bug outputs message File Exists 'single space' => ' ', diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt index c77c66b531..b5254034be 100644 --- a/ext/standard/tests/file/mkdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir() function : usage variation: try invalid pathname +Test mkdir() function : usage variation: try invalid pathname --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 430c36ec99..0b461d2635 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -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..1c0baa09f7 100644 --- a/ext/standard/tests/file/mkdir_variation3.phpt +++ b/ext/standard/tests/file/mkdir_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -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 c44a530e1e..862dec8c4e 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource 'file resource' => $fileRes, ); @@ -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/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index b805dee3be..c7ebd518da 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -29,35 +29,35 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir $unixifiedDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt index ea60edf42f..8a02fe1d67 100644 --- a/ext/standard/tests/file/mkdir_variation5.phpt +++ b/ext/standard/tests/file/mkdir_variation5.phpt @@ -1,18 +1,18 @@ --TEST-- -Test mkdir() function : variation: various valid and invalid paths +Test mkdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mkdir() : variation ***\n"; @@ -27,32 +27,32 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { - echo "-- creating $dir --\n"; + echo "-- creating $dir --\n"; $res = mkdir($dir); if ($res === true) { echo "Directory created\n"; diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index a79951e013..439fcaf301 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -4,7 +4,7 @@ Test parse_ini_file() function <?php /* Prototype: array parse_ini_file(string $filename [,bool $process_sections]); Description: parse_ini_file() loads in the ini file specified in filename, - and returns the settings in it in an associative array. + and returns the settings in it in an associative array. */ $file_path = dirname(__FILE__); @@ -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_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 29e022fb13..14990b2606 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_ini_file() function : error conditions +Test parse_ini_file() function : error conditions --FILE-- <?php /* Prototype : proto array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : error conditions ***\n"; @@ -23,7 +23,7 @@ var_dump( parse_ini_file($filename, $process_sections, $extra_arg) ); echo "\n-- Testing parse_ini_file() function with a non-existent file --\n"; $filename = __FILE__ . 'invalidfilename'; -var_dump( parse_ini_file($filename, $process_sections) ); +var_dump( parse_ini_file($filename, $process_sections) ); echo "Done"; ?> diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index 666ea433b1..a24bc1c051 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt index e7b9091737..20ad6bb067 100644 --- a/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt index 96d44433f7..43b0274ea9 100644 --- a/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -32,7 +32,7 @@ foreach($newdirs as $newdir) { set_include_path($newIncludePath); $path = get_include_path(); echo "New include path is : " . $path . "\n"; - + $output_file = $dir2."/".$iniFile; $iniContent = <<<FILE error_reporting = E_ALL diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt index e80c25822d..66cab3bedc 100644 --- a/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index 2cf2013988..52b5d02764 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -1,13 +1,13 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : usage variation ***\n"; @@ -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/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index 432441ae6e..4e5d4347e4 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 7d5b650cc3..6dfbee990a 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -35,14 +35,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index a4f24e4e13..e9844e905a 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_ini_file() : variation ***\n"; @@ -29,14 +29,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", - + "BADDIR", + ); $filename = 'ParseIniFileVar6.ini'; diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt index 48d01dd66c..0ab4776e02 100644 --- a/ext/standard/tests/file/pathinfo_basic.phpt +++ b/ext/standard/tests/file/pathinfo_basic.phpt @@ -45,7 +45,7 @@ $paths = array ( /* Testing with homedir notation */ "~/PHP/php5.2.0/", - + /* Testing normal directory notation */ "/home/example/test/", "http://httpd.apache.org/core.html#acceptpathinfo" diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index ea95ed1e2b..2adf90bc94 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', @@ -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 89b733b690..ed2a138c1f 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', @@ -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-win32.phpt b/ext/standard/tests/file/pathinfo_basic2-win32.phpt index 5a88b648d3..4c2fd2cacf 100644 --- a/ext/standard/tests/file/pathinfo_basic2-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic2-win32.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index c146876649..4087c6d445 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -31,7 +31,7 @@ $paths = array ( '..', '...', '/usr/lib/.../afile' - + ); $counter = 1; @@ -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_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt index 36d9bab5ae..ff4c1eb818 100644 --- a/ext/standard/tests/file/pathinfo_variation1.phpt +++ b/ext/standard/tests/file/pathinfo_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index d0c1b37a52..84c8243369 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; @@ -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/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index b8509dc8ec..333aa56838 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pathinfo() : usage variation ***\n"; diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index 421f378e01..d6c6c774b4 100644 --- a/ext/standard/tests/file/pathinfo_variaton.phpt +++ b/ext/standard/tests/file/pathinfo_variaton.phpt @@ -57,7 +57,7 @@ $paths = array ( /* pathname as NULL */ NULL, null, - + /* filename as resource */ $fp, diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index c1fbf4a2e1..2a3251bd36 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test pclose() function : usage variation +Test pclose() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int pclose(resource fp) - * Description: Close a file pointer opened by popen() + * Description: Close a file pointer opened by popen() * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing pclose() : usage variation ***\n"; @@ -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/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index 1c5defdaef..51f4d9f171 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -1,7 +1,7 @@ --TEST-- php://fd wrapper: invalid file descriptor --SKIPIF-- -<?php include('skipif.inc'); +<?php include('skipif.inc'); if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); 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 6dd995b43c..b321ba3f38 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); @@ -59,7 +59,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 2b05b25a13..ea82c7781f 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); @@ -59,7 +59,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 bbdddf51b2..812a24e5ff 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test popen() and pclose function: basic functionality +Test popen() and pclose function: basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) @@ -72,7 +72,7 @@ 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 e41d6b113e..3c4439e5cb 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt @@ -56,7 +56,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 9f9593c64b..1d059828d0 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt @@ -51,7 +51,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 72ce73411c..8b851f13bb 100644 --- a/ext/standard/tests/file/popen_pclose_error.phpt +++ b/ext/standard/tests/file/popen_pclose_error.phpt @@ -50,7 +50,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..28e68a2477 100644 --- a/ext/standard/tests/file/proc_open01.phpt +++ b/ext/standard/tests/file/proc_open01.phpt @@ -4,14 +4,14 @@ proc_open() regression test 1 (proc_open() leak) <?php $pipes = array(1, 2, 3); $orig_pipes = $pipes; -$php = getenv('TEST_PHP_EXECUTABLE'); +$php = getenv('TEST_PHP_EXECUTABLE'); if ($php === false) { die("no php executable defined"); -} +} $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"; @@ -24,7 +24,7 @@ fflush($pipes[0]); fclose($pipes[0]); $cnt = ''; $n=0; -for ($left = strlen($test_string); $left > 0;) { +for ($left = strlen($test_string); $left > 0;) { if (++$n >1000) { print "terminated after 1000 iterations\n"; break; 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_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index a240a826b9..61f6aba7a5 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -10,16 +10,16 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ "-1" => -1, "TRUE" => TRUE, "FALSE" => FALSE, @@ -30,7 +30,7 @@ $names_arr = array( "array()" => array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir" => "/no/such/file/dir", + "/no/such/file/dir" => "/no/such/file/dir", "php/php"=> "php/php" ); diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt Binary files differindex 59b92ad365..3bbc329f31 100644 --- a/ext/standard/tests/file/readfile_variation10.phpt +++ b/ext/standard/tests/file/readfile_variation10.phpt 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_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt index a22b2b4044..854642a36d 100644 --- a/ext/standard/tests/file/readfile_variation3.phpt +++ b/ext/standard/tests/file/readfile_variation3.phpt @@ -7,7 +7,7 @@ Test readfile() function: usage variation - include path */ /* test readfile() by providing an include path, second argument */ -// include file.inc +// include file.inc require("file.inc"); $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 1df3690849..798a065073 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; @@ -107,7 +107,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); @@ -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..8c95ce8486 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : usage variation ***\n"; @@ -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/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index dca6f4df67..02e708220c 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($secondFile); + unlink($secondFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index b41721ae4f..d26f52f492 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -1,13 +1,13 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ require_once('fopen_include_path.inc'); @@ -39,7 +39,7 @@ function runtest() { fclose($h); readfile($filename, true); echo "\n"; - unlink($scriptLocFile); + unlink($scriptLocFile); } ?> diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index b4fb0bf322..e53f362367 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index dde7a1ec7a..a66af5d25b 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -44,14 +44,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index cf80caae99..c802f4018a 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing readfile() : variation ***\n"; @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/readlink_realpath_basic1.phpt b/ext/standard/tests/file/readlink_realpath_basic1.phpt index 6efe7f2d49..99195e2b24 100644 --- a/ext/standard/tests/file/readlink_realpath_basic1.phpt +++ b/ext/standard/tests/file/readlink_realpath_basic1.phpt @@ -26,7 +26,7 @@ fclose($file_handle1); fclose($file_handle2); fclose($file_handle3); -symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", +symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp"); symlink("$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp", "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp"); @@ -38,7 +38,7 @@ $linknames = array ( "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp", - + /* linknames with invalid linkpath */ "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp", "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp", diff --git a/ext/standard/tests/file/readlink_realpath_variation1.phpt b/ext/standard/tests/file/readlink_realpath_variation1.phpt index ab1d955778..341e39a9de 100644 --- a/ext/standard/tests/file/readlink_realpath_variation1.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation1.phpt @@ -36,30 +36,30 @@ $obj1 = new object_temp("$name_prefix/readlink_realpath_variation1/../././readli $obj2 = new object_temp("$name_prefix/readlink_realpath_variation1/home/../..///readlink_realpath_variation1_link.tmp"); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an object --\n"; -// creating the links -var_dump( symlink($filename, $obj1->linkname) ); -var_dump( readlink($obj1->linkname) ); +// creating the links +var_dump( symlink($filename, $obj1->linkname) ); +var_dump( readlink($obj1->linkname) ); var_dump( realpath($obj1->linkname) ); -var_dump( symlink($filename, $obj2->linkname) ); +var_dump( symlink($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); var_dump( realpath($obj2->linkname) ); // deleting the link unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an object --\n"; // creating hard links -var_dump( link($filename, $obj1->linkname) ); +var_dump( link($filename, $obj1->linkname) ); var_dump( readlink($obj1->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj1->linkname) ); -var_dump( link($filename, $obj2->linkname) ); +var_dump( link($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj2->linkname) ); -// delete the links +// delete the links unlink($obj1->linkname); -unlink($obj2->linkname); +unlink($obj2->linkname); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index c7add6b037..0e748576ae 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -31,31 +31,31 @@ $link_arr = array ( ); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n"; -// creating the links -var_dump( symlink($filename, $link_arr[0]) ); -var_dump( readlink($link_arr[0]) ); -var_dump( realpath($link_arr[0]) ); -var_dump( symlink($filename, $link_arr[1]) ); +// creating the links +var_dump( symlink($filename, $link_arr[0]) ); +var_dump( readlink($link_arr[0]) ); +var_dump( realpath($link_arr[0]) ); +var_dump( symlink($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); var_dump( realpath($link_arr[1]) ); // deleting the link unlink($link_arr[0]); -unlink($link_arr[1]); +unlink($link_arr[1]); echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an array --\n"; // creating hard links -var_dump( link($filename, $link_arr[0]) ); +var_dump( link($filename, $link_arr[0]) ); var_dump( readlink($link_arr[0]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[0]) ); -var_dump( link($filename, $link_arr[1]) ); +var_dump( link($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[1]) ); -// delete the links +// delete the links unlink($link_arr[0]); -unlink($link_arr[1]); - +unlink($link_arr[1]); + echo "Done\n"; ?> --CLEAN-- diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt index 58e58237ef..3766a5b43a 100644 --- a/ext/standard/tests/file/readlink_realpath_variation3.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ echo "*** Testing readlink() and realpath() : usage variations ***\n"; - + echo "\n*** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***\n"; $link_string = array ( /* linkname as spaces */ @@ -34,8 +34,8 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) { echo $loop_counter + 1; echo " --\n"; - var_dump( readlink($link_string[$loop_counter]) ); - var_dump( realpath($link_string[$loop_counter]) ); + var_dump( readlink($link_string[$loop_counter]) ); + var_dump( realpath($link_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt index c66e2a4265..d4f1a5ff02 100644 --- a/ext/standard/tests/file/readlink_variation1.phpt +++ b/ext/standard/tests/file/readlink_variation1.phpt @@ -27,12 +27,12 @@ $filenames = array( FALSE, NULL, $file_handle, - + /* scalars */ 1234, 0 ); - + /* loop through to test each element the above array */ foreach( $filenames as $filename ) { var_dump( readlink($filename) ); diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt index f16995eaa2..0eb9dc519a 100644 --- a/ext/standard/tests/file/realpath_cache.phpt +++ b/ext/standard/tests/file/realpath_cache.phpt @@ -15,7 +15,7 @@ var_dump($data[__DIR__]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) array(4) { ["key"]=> diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt index bb8016875a..fa5f22c3b5 100644 --- a/ext/standard/tests/file/realpath_cache_win32.phpt +++ b/ext/standard/tests/file/realpath_cache_win32.phpt @@ -11,19 +11,19 @@ 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"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) 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/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt index 25ea530894..66d7c8b0c7 100644 --- a/ext/standard/tests/file/realpath_variation-win32-mb.phpt +++ b/ext/standard/tests/file/realpath_variation-win32-mb.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™/home/../home//tests//..//..//..//home//realpath_variation_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt index 8049d4c69a..f58f618993 100644 --- a/ext/standard/tests/file/realpath_variation-win32.phpt +++ b/ext/standard/tests/file/realpath_variation-win32.phpt @@ -43,7 +43,7 @@ $file_arr = array ( "$name_prefix/./realpath_variation/home/../home//tests//..//..//..//home//realpath_variation.tmp/" ); -var_dump( realpath($file_arr[0]) ); +var_dump( realpath($file_arr[0]) ); var_dump( realpath($file_arr[1]) ); echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n"; @@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) { echo "-- Iteration"; echo $loop_counter + 1; echo " --\n"; - var_dump( realpath($file_string[$loop_counter]) ); + var_dump( realpath($file_string[$loop_counter]) ); } echo "Done\n"; diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index 0c8bdb87e5..a5031aa7b5 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -10,23 +10,23 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) --FILE-- <?php /* Prototype : string realpath(string path) - * Description: Return the resolved path + * Description: Return the resolved path * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing realpath() : variation ***\n"; -$paths = array('c:\\', - 'c:', - 'c' , - '\\' , - '/', - 'c:temp', - 'c:\\/', +$paths = array('c:\\', + 'c:', + 'c' , + '\\' , + '/', + 'c:temp', + 'c:\\/', '/tmp/', - '/tmp/\\', - '\\tmp', + '/tmp/\\', + '\\tmp', '\\tmp\\'); foreach($paths as $path) { diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt index 238333e776..c589c514e4 100644 --- a/ext/standard/tests/file/rename_basic.phpt +++ b/ext/standard/tests/file/rename_basic.phpt @@ -25,7 +25,7 @@ var_dump( file_exists($dest_name) ); // expecting true $new_stat = stat("$file_path/rename_basic_new.tmp"); // checking statistics of old and renamed file - both should be same except ctime -$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, +$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "blksize", "blocks"); var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); diff --git a/ext/standard/tests/file/rename_error.phpt b/ext/standard/tests/file/rename_error.phpt index e0ea2043c9..fae2b4f373 100644 --- a/ext/standard/tests/file/rename_error.phpt +++ b/ext/standard/tests/file/rename_error.phpt @@ -8,7 +8,7 @@ Test rename() function: error conditions echo "*** Testing rename() for error conditions ***\n"; //Zero argument -var_dump( rename() ); +var_dump( rename() ); // less than expected,1 argument var_dump( rename(__FILE__) ); @@ -17,7 +17,7 @@ var_dump( rename(__FILE__) ); $context = stream_context_create(); $filename = __FILE__; $new_filename = __FILE__.".tmp"; -var_dump( rename($filename, $new_filename, $context, "extra_args") ); +var_dump( rename($filename, $new_filename, $context, "extra_args") ); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index 828837a84d..a10c6dfbe7 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -41,16 +41,16 @@ foreach($src_filenames as $src_filename) { $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index 2f25d193f5..00dc309982 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -33,17 +33,17 @@ foreach($src_filenames as $src_filename) { fclose($fp); $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - - // unlink the file + + // unlink the file unlink($dest_filename); } // clean the temp dir and file -rmdir("$file_path/rename_variation"); +rmdir("$file_path/rename_variation"); echo "Done\n"; ?> diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 2196e10721..519801fbda 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -45,7 +45,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true @@ -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..74c5988491 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation1/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true @@ -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..f84adc890a 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() : usage variation ***\n"; @@ -104,7 +104,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes, ); @@ -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_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index e940f78070..c13a09a951 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with absolute and relative paths ***\n"; @@ -39,14 +39,14 @@ $allDirs = array( "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir, "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir, "$absSubDir\\BADDIR", - + // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, - "BADDIR", - + "BADDIR", + // unixifed path $unixifiedDir, ); diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index 064daa4dfe..de5fc14004 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt index a423496fbc..168beeffc9 100644 --- a/ext/standard/tests/file/rename_variation12.phpt +++ b/ext/standard/tests/file/rename_variation12.phpt @@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip.. not for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ /* Creating unique files in various dirs by passing relative paths to $dir arg */ @@ -38,14 +38,14 @@ $allDirs = array( "$absSubDir/../../".$mainDir."/./".$subDir, "$absSubDir/..///".$subDir."//..//../".$subDir, "$absSubDir/BADDIR", - - + + // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($allDirs); $i++) { diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt Binary files differindex 894cfb2614..a5030761a5 100644 --- a/ext/standard/tests/file/rename_variation13-win32.phpt +++ b/ext/standard/tests/file/rename_variation13-win32.phpt diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index 2686150f23..ec1ee7c78d 100644 --- a/ext/standard/tests/file/rename_variation13.phpt +++ b/ext/standard/tests/file/rename_variation13.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rename() with obscure files ***\n"; @@ -21,9 +21,9 @@ $aFile = $file_path.'/afile.tmp'; mkdir($file_path); -/* An array of files */ +/* An array of files */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -34,7 +34,7 @@ $names_arr = array( array(), /* prefix with path separator of a non existing directory*/ - "/no/such/file/dir", + "/no/such/file/dir", "php/php" ); diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt index 9627a9fa53..193bb28f1f 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..c4b575e922 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -29,7 +29,7 @@ var_dump(symlink($filename, $linkname)); //rename the link to a new name in the same dir $dest_linkname = $file_path."/rename_variation2_soft_link2.tmp"; var_dump( rename( $linkname, $dest_linkname) ); -//ensure that link was renamed +//ensure that link was renamed clearstatcache(); var_dump( file_exists($linkname) ); // expecting false var_dump( file_exists($dest_linkname) ); // expecting true @@ -41,7 +41,7 @@ clearstatcache(); var_dump( file_exists($dest_linkname) ); // expecting false var_dump( file_exists($dest_dir."/rename_variation2_soft_link2.tmp") ); // expecting true -// delete the link file now +// delete the link file now unlink($dest_dir."/rename_variation2_soft_link2.tmp"); echo "Done\n"; @@ -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-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt index 5f071fb5b9..b5da587811 100644 --- a/ext/standard/tests/file/rename_variation3-win32.phpt +++ b/ext/standard/tests/file/rename_variation3-win32.phpt @@ -16,13 +16,13 @@ require dirname(__FILE__).'/file.inc'; /* creating directory */ $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation3_dir"; +$dirname = "$file_path/rename_variation3_dir"; mkdir($dirname); /* test rename() by trying to rename an existing file/dir to the same name and one another */ -$filename = "$file_path/rename_variation3.tmp"; +$filename = "$file_path/rename_variation3.tmp"; $fp = fopen($filename, "w"); if (!$fp) { die("Cannot create $filename\n"); 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/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt index 8ea2499eed..2518cf48ea 100644 --- a/ext/standard/tests/file/rename_variation5.phpt +++ b/ext/standard/tests/file/rename_variation5.phpt @@ -11,12 +11,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* test rename() by trying to rename an existing file/dir/link to the same name and one another */ -// create a dir +// create a dir $file_path = dirname(__FILE__); -$dirname = "$file_path/rename_variation5_dir"; +$dirname = "$file_path/rename_variation5_dir"; mkdir($dirname); //create a file -$filename = "$file_path/rename_variation5.tmp"; +$filename = "$file_path/rename_variation5.tmp"; $fp = fopen($filename, "w"); fclose($fp); // create a link diff --git a/ext/standard/tests/file/rename_variation6-win32.phpt b/ext/standard/tests/file/rename_variation6-win32.phpt index 9129bd871e..dfb57f2e19 100644 --- a/ext/standard/tests/file/rename_variation6-win32.phpt +++ b/ext/standard/tests/file/rename_variation6-win32.phpt @@ -34,7 +34,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): %s in %s on line %d bool(false) string(%d) "%srename_variation6-win32.php.tmp" diff --git a/ext/standard/tests/file/rename_variation6.phpt b/ext/standard/tests/file/rename_variation6.phpt index 3385d14134..413dc6e045 100644 --- a/ext/standard/tests/file/rename_variation6.phpt +++ b/ext/standard/tests/file/rename_variation6.phpt @@ -28,7 +28,7 @@ var_dump(file_exists($tmp_file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%srename_variation6.php.tmp" diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt index a9643b4491..369e8c2d43 100644 --- a/ext/standard/tests/file/rename_variation7-win32.phpt +++ b/ext/standard/tests/file/rename_variation7-win32.phpt @@ -25,7 +25,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d diff --git a/ext/standard/tests/file/rename_variation7.phpt b/ext/standard/tests/file/rename_variation7.phpt index dc5ce429b6..5b937728f8 100644 --- a/ext/standard/tests/file/rename_variation7.phpt +++ b/ext/standard/tests/file/rename_variation7.phpt @@ -24,7 +24,7 @@ var_dump(readlink($tmp_link2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: readlink(): No such file or directory in %s on line %d bool(false) string(%d) "%sthere_is_no_such_file" diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index b3a1797c7a..7be25949f6 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 2026a249bc..6e236c376c 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 5a958631d9..2516e6162e 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -71,7 +71,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other // php outputs Permission Denied, p8 outputs no suck file or dir 'single space' => ' ', diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index 0556266efa..04fee0ee2a 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -72,7 +72,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // other 'single space' => ' ', ); diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 2b4f607ade..8c5af1a351 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : usage variation ***\n"; @@ -102,7 +102,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // non stream context resource $fileres, ); @@ -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/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index 2418ccfd5f..e6b3eaabb6 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Only valid for Windows"); -?> +?> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -29,36 +29,36 @@ $dirs = array( $workDir.'\\'.$subDir, '.\\'.$workDir.'\\'.$subDir, $workDir.'\\..\\'.$workDir.'\\'.$subDir, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$subDir, 'BADDIR\\'.$subDir, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDir, $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, - + //trailing separators $workDir.'\\'.$subDir.'\\', $cwd.'\\'.$workDir.'\\'.$subDir.'\\', - + // multiple separators $workDir.'\\\\'.$subDir, $cwd.'\\\\'.$workDir.'\\\\'.$subDir, - + // Unixified Dir - $unixifiedDir, - + $unixifiedDir, + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index fd700a0062..5848007395 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -1,13 +1,13 @@ --TEST-- -Test rmdir() function : variation: various valid and invalid paths +Test rmdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing rmdir() : variation ***\n"; @@ -22,33 +22,33 @@ $dirs = array( $workDir.'/'.$subDir, './'.$workDir.'/'.$subDir, $workDir.'/../'.$workDir.'/'.$subDir, - + // relative bad path $workDir.'/../BADDIR/'.$subDir, 'BADDIR/'.$subDir, - + //absolute $cwd.'/'.$workDir.'/'.$subDir, $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, - + //trailing separators $workDir.'/'.$subDir.'/', $cwd.'/'.$workDir.'/'.$subDir.'/', - + // multiple separators $workDir.'//'.$subDir, $cwd.'//'.$workDir.'//'.$subDir, - + ); - + foreach($dirs as $dir) { mkdir($workDir.'/'.$subDir); - echo "-- removing $dir --\n"; + echo "-- removing $dir --\n"; $res = rmdir($dir); if ($res === true) { echo "Directory removed\n"; diff --git a/ext/standard/tests/file/stat_basic-win32-mb.phpt b/ext/standard/tests/file/stat_basic-win32-mb.phpt index c5f4e6c7ab..334eb9ea65 100644 --- a/ext/standard/tests/file/stat_basic-win32-mb.phpt +++ b/ext/standard/tests/file/stat_basic-win32-mb.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt index cde62730bd..e3e7ea7eb5 100644 --- a/ext/standard/tests/file/stat_basic-win32.phpt +++ b/ext/standard/tests/file/stat_basic-win32.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt index 3614ba5f7e..1b69da8bf5 100644 --- a/ext/standard/tests/file/stat_error-win32.phpt +++ b/ext/standard/tests/file/stat_error-win32.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { Description: Gives information about a file */ -$file_path = dirname(__FILE__); +$file_path = dirname(__FILE__); $arr = array(__FILE__); echo "\n*** Testing stat() for error conditions ***\n"; diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index 0c91b2afbc..d49f5244f7 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); @@ -77,7 +77,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 e3be517cfa..0dcf271d99 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); @@ -77,7 +77,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 2bd9f80c50..b6a9300bb4 100644 --- a/ext/standard/tests/file/stat_variation2-win32.phpt +++ b/ext/standard/tests/file/stat_variation2-win32.phpt @@ -54,7 +54,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 e248116486..e472a006ed 100644 --- a/ext/standard/tests/file/stat_variation3-win32.phpt +++ b/ext/standard/tests/file/stat_variation3-win32.phpt @@ -65,7 +65,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 -- diff --git a/ext/standard/tests/file/stat_variation4-win32.phpt b/ext/standard/tests/file/stat_variation4-win32.phpt index a0ffed285f..0b3c66ad5c 100644 --- a/ext/standard/tests/file/stat_variation4-win32.phpt +++ b/ext/standard/tests/file/stat_variation4-win32.phpt @@ -75,7 +75,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 038b9b64eb..a28cc76d54 100644 --- a/ext/standard/tests/file/stat_variation5-win32.phpt +++ b/ext/standard/tests/file/stat_variation5-win32.phpt @@ -55,7 +55,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) diff --git a/ext/standard/tests/file/stat_variation6-win32.phpt b/ext/standard/tests/file/stat_variation6-win32.phpt index 3dae75b2e6..d30b8fd8d7 100644 --- a/ext/standard/tests/file/stat_variation6-win32.phpt +++ b/ext/standard/tests/file/stat_variation6-win32.phpt @@ -74,7 +74,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) diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt index 079bd0d73a..23d0159e79 100644 --- a/ext/standard/tests/file/stat_variation8-win32.phpt +++ b/ext/standard/tests/file/stat_variation8-win32.phpt @@ -66,7 +66,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/statpage.phpt b/ext/standard/tests/file/statpage.phpt index 5bd4183c21..f11be9734c 100644 --- a/ext/standard/tests/file/statpage.phpt +++ b/ext/standard/tests/file/statpage.phpt @@ -11,7 +11,7 @@ var_dump(getmygid()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) int(%d) int(%d) diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index 6e692c554a..eece30a2f5 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -10,7 +10,7 @@ var_dump(fopen("file://".__FILE__, "r")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt index b18dd85b31..e982f704c4 100644 --- a/ext/standard/tests/file/stream_002.phpt +++ b/ext/standard/tests/file/stream_002.phpt @@ -20,7 +20,7 @@ var_dump($a, $b); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_socket_client(): unable to connect to (Failed to parse address "") in %s on line %d bool(false) int(0) diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt index 1cc57b7f6d..716ae1f462 100644 --- a/ext/standard/tests/file/stream_copy_to_stream.phpt +++ b/ext/standard/tests/file/stream_copy_to_stream.phpt @@ -111,7 +111,7 @@ unlink($new_file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) string(0) "" int(%d) 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 1a8da936b3..0f64ec16af 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 8fa1c16b0c..e2d58b4424 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..48c7cdb3f1 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -14,7 +14,7 @@ foreach($streams as $stream) echo "===$stream===\n"; $fp = fopen($stream, 'rb'); - + var_dump(ftell($fp)); var_dump(feof($fp)); echo "===S:4,S===\n"; @@ -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/stream_supports_lock.phpt b/ext/standard/tests/file/stream_supports_lock.phpt index 38a84dd7c2..bbf3993b6b 100644 --- a/ext/standard/tests/file/stream_supports_lock.phpt +++ b/ext/standard/tests/file/stream_supports_lock.phpt @@ -30,7 +30,7 @@ var_dump(stream_supports_lock($sock)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt index 228e459297..489c26644f 100644 --- a/ext/standard/tests/file/symlink.phpt +++ b/ext/standard/tests/file/symlink.phpt @@ -44,7 +44,7 @@ var_dump(linkinfo(".")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(true) string(%d) "%ssymlink.dat" int(%d) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt index 09fb35c973..416e6ae323 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt @@ -50,7 +50,7 @@ $files = array ( ); $counter = 1; -/* create soft/hard link to the file +/* create soft/hard link to the file and check linkinfo() and is_link() on the link created */ foreach($files as $file) { echo "\n-- Iteration $counter --\n"; 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 98ce6211da..0386e64415 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_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt index 12e5da17e8..b1b1afc740 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt @@ -23,7 +23,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Variation 1 : Creating links across directories where linkname is stored as an object and array member */ -// creating temp directory which will contain temp file and links created +// creating temp directory which will contain temp file and links created $file_path = dirname(__FILE__); $dirname = "$file_path/symlink_link_linkinfo_is_link_variation1/test/home"; mkdir($dirname, 0777, true); @@ -58,11 +58,11 @@ clearstatcache(); /* Testing on hard links */ echo "\n-- Working with hard links --\n"; // creating hard link -var_dump( link($filename, $obj->linkname) ); +var_dump( link($filename, $obj->linkname) ); // check if the link exists var_dump( linkinfo($obj->linkname) ); // check if link is soft link; expected: false as the link is a hardlink -var_dump( is_link($obj->linkname) ); +var_dump( is_link($obj->linkname) ); // delete the link created unlink($obj->linkname); // clear the cache 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..dc353e5097 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 @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 3 : Create file and a soft link to the file - Access data of the file through the soft link + Access data of the file through the soft link Update the file through soft link Check size of file and soft link link */ @@ -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..74f03e2097 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 @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 4 : Create file and a hard link to the file - Access data of the file through the hard link + Access data of the file through the hard link Update the file through hard link Check size of file and hard link */ @@ -45,7 +45,7 @@ $data_from_link = file_get_contents($linkname); // data read from $filename var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -61,7 +61,7 @@ $data_from_file = file_get_contents($filename); var_dump( $data_from_file ); echo "\n-- Check size of hard link and file --\n"; -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -79,7 +79,7 @@ var_dump( $data_from_link ); echo "\n-- Check size of hard link and file --\n"; var_dump( filesize($filename) ); var_dump( filesize($linkname) ); -if( filesize($filename) == filesize($linkname) ) +if( filesize($filename) == filesize($linkname) ) echo "\nSize of file and hard link are same\n"; else echo "\nWarning: Size of file and hard link differ\n"; @@ -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..e2f30cdfda 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"; @@ -54,7 +51,7 @@ echo "\n-- Working with soft links --\n"; $linkname = "$dirname/non_existent_link_variation5.tmp"; // expected: false -var_dump( symlink($filename, $linkname) ); // this link won't get created +var_dump( symlink($filename, $linkname) ); // this link won't get created var_dump( linkinfo($linkname) ); var_dump( is_link($linkname) ); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt index df63dcfc5d..82ca75b64d 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt @@ -33,7 +33,7 @@ $linkname = "$dir/symlink_link_linkinfo_is_link_link_variation7.tmp"; $dirname = "$dir/home/test"; mkdir($dirname, 0755, true); -// create file +// create file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt index 8a771b27b9..aacbcd4b3f 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt @@ -21,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Description: Gets information about a link */ -/* Variation 9 : Check lstat of soft/hard link created +/* Variation 9 : Check lstat of soft/hard link created Check linkinfo() value with lstat['dev'] */ // temp file used @@ -34,7 +34,7 @@ $soft_link = "$dirname/symlink_link_linkinfo_is_link_softlink_variation9.tmp"; // hard link name used $hard_link = "$dirname/symlink_link_linkinfo_is_link_hardlink_variation9.tmp"; -// create the file +// create the file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt index 3e659c092c..4d985410da 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt index a571a7cd5b..a3dd7e9d62 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") @@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; clearstatcache(); echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { + else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) { echo "directory specified\n"; } else { diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index dbdc396656..0745f5397c 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -21,12 +21,12 @@ for($i=1; $i<=10; $i++) { echo "-- Iteration $i --\n"; $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp"); - if( file_exists($files[$i]) ) { + if( file_exists($files[$i]) ) { - echo "File name is => "; + echo "File name is => "; print($files[$i]); echo "\n"; - + echo "File permissions are => "; printf("%o", fileperms($files[$i]) ); echo "\n"; @@ -35,10 +35,10 @@ for($i=1; $i<=10; $i++) { echo "File inode is => "; print_r( fileinode($files[$i]) ); //checking inodes echo "\n"; - + echo "File created in => "; - $file_dir = dirname($files[$i]); - + $file_dir = dirname($files[$i]); + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } diff --git a/ext/standard/tests/file/tempnam_variation2-win32.phpt b/ext/standard/tests/file/tempnam_variation2-win32.phpt index 60fe951353..15d59614ff 100644 --- a/ext/standard/tests/file/tempnam_variation2-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation2-win32.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,27 +57,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation2.phpt b/ext/standard/tests/file/tempnam_variation2.phpt index dd98b40e8b..1a2de1885b 100644 --- a/ext/standard/tests/file/tempnam_variation2.phpt +++ b/ext/standard/tests/file/tempnam_variation2.phpt @@ -31,23 +31,23 @@ $dir_paths = array( "$dir_path/../.././tempnam_variation2", "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2", "$dir_path/BADDIR", - - + + // relative paths ".", "tempname_variation2", "tempname_variation2/", "tempnam_variation2/tempnam_variation2_sub", - "tempnam_variation2//tempnam_variation2_sub", + "tempnam_variation2//tempnam_variation2_sub", "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -57,11 +57,11 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } @@ -70,14 +70,14 @@ for($i = 0; $i<count($dir_paths); $i++) { } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt index 47da53df01..e96846ff2c 100644 --- a/ext/standard/tests/file/tempnam_variation4-0.phpt +++ b/ext/standard/tests/file/tempnam_variation4-0.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0000 to 0350, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ @@ -44,9 +44,9 @@ for($mode = 0000; $mode <= 0350; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt index 39f1fb0053..667d3ecda6 100644 --- a/ext/standard/tests/file/tempnam_variation4-1.phpt +++ b/ext/standard/tests/file/tempnam_variation4-1.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0351 to 0777, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ @@ -44,9 +44,9 @@ for($mode = 0351; $mode <= 0777; $mode++) { if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) { echo " created in unexpected dir\n"; - } + } } - unlink($file_name); + unlink($file_name); } else { print("FAILED: File is not created\n"); diff --git a/ext/standard/tests/file/tempnam_variation5-win32.phpt b/ext/standard/tests/file/tempnam_variation5-win32.phpt index d2e708bc30..3e39352fe1 100644 --- a/ext/standard/tests/file/tempnam_variation5-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation5-win32.phpt @@ -25,7 +25,7 @@ $h = fopen($dir_name."/tempnam_variation6.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation6.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt index fdfcee9bed..cf2eff8bec 100644 --- a/ext/standard/tests/file/tempnam_variation5.phpt +++ b/ext/standard/tests/file/tempnam_variation5.phpt @@ -23,7 +23,7 @@ $h = fopen($dir_name."/tempnam_variation5.tmp", "w"); for($i=1; $i<=3; $i++) { echo "-- Iteration $i --\n"; $created_file = tempnam("$dir_name", "tempnam_variation5.tmp"); - + if( file_exists($created_file) ) { echo "File name is => "; print($created_file); diff --git a/ext/standard/tests/file/tempnam_variation6-win32.phpt b/ext/standard/tests/file/tempnam_variation6-win32.phpt index acaa1abf50..efe7e86e85 100644 --- a/ext/standard/tests/file/tempnam_variation6-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation6-win32.phpt @@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows Only"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -27,10 +27,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -39,7 +39,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation6.phpt b/ext/standard/tests/file/tempnam_variation6.phpt index 08a9fce4de..5eb6e6fc86 100644 --- a/ext/standard/tests/file/tempnam_variation6.phpt +++ b/ext/standard/tests/file/tempnam_variation6.phpt @@ -4,7 +4,7 @@ Test tempnam() function: usage variations - Using previous unique filename <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Do not run on Windows"); -?> +?> --FILE-- <?php /* Prototype: string tempnam ( string $dir, string $prefix ); @@ -25,10 +25,10 @@ for($i=1; $i<=3; $i++) { echo "File name is => "; print($file_name); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if ($file_dir == sys_get_temp_dir()) { echo "temp dir\n"; } @@ -37,7 +37,7 @@ for($i=1; $i<=3; $i++) { } else { echo "unknown location\n"; - } + } } unlink($file_name); diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 40999fef47..918ef36588 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) != "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ - + echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index 4a5ffcd332..d24c1d8974 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; -/* An array of names, which will be passed as a dir name */ +/* An array of names, which will be passed as a dir name */ $names_arr = array( - /* Invalid args */ + /* Invalid args */ -1, TRUE, FALSE, @@ -28,7 +28,7 @@ $names_arr = array( array(), /* Non-existing dirs */ - "/no/such/file/dir", + "/no/such/file/dir", "php" ); @@ -46,22 +46,22 @@ for( $i=0; $i<count($names_arr); $i++ ) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); - + if (realpath($file_dir) == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } else { echo "unknown location\n"; - } - + } + } - else { + else { echo "-- File is not created --\n"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/tempnam_variation8-win32.phpt b/ext/standard/tests/file/tempnam_variation8-win32.phpt index cceda6438f..52ff7b9daa 100644 --- a/ext/standard/tests/file/tempnam_variation8-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation8-win32.phpt @@ -32,21 +32,21 @@ $dir_paths = array( "$dir_path\\..\\..\\.\\tempnam_variation2", "$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2", "$dir_path\\BADDIR", - - + + // relative paths "tempname_variation2\\", "tempnam_variation2\\tempnam_variation2_sub", - "tempnam_variation2\\\\tempnam_variation2_sub", + "tempnam_variation2\\\\tempnam_variation2_sub", ".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub", - "BADDIR", + "BADDIR", ); for($i = 0; $i<count($dir_paths); $i++) { $j = $i+1; echo "\n-- Iteration $j --\n"; $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp"); - + if( file_exists($file_name) ){ echo "File name is => "; @@ -56,27 +56,27 @@ for($i = 0; $i<count($dir_paths); $i++) { echo "File permissions are => "; printf("%o", fileperms($file_name) ); echo "\n"; - + echo "File created in => "; $file_dir = dirname($file_name); $dir_req = $dir_paths[$i]; - + if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) { echo "temp dir\n"; } - else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { + else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) { echo "directory specified\n"; } else { echo "unknown location\n"; - } - + } + } else { echo "-- File is not created --"; } - + unlink($file_name); } diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt index fa000db008..c6c270d065 100644 --- a/ext/standard/tests/file/touch.phpt +++ b/ext/standard/tests/file/touch.phpt @@ -38,7 +38,7 @@ var_dump(touch("/no/such/file/or/directory")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL bool(true) diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index 9a87ac60a6..d721edc84c 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt index ff0b9d944b..b4ad29f037 100644 --- a/ext/standard/tests/file/touch_basic-win32.phpt +++ b/ext/standard/tests/file/touch_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt index a4c319aefa..b39c84b7e0 100644 --- a/ext/standard/tests/file/touch_basic.phpt +++ b/ext/standard/tests/file/touch_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : basic functionality ***\n"; diff --git a/ext/standard/tests/file/touch_error.phpt b/ext/standard/tests/file/touch_error.phpt index 9fa8a81739..ec58fee511 100644 --- a/ext/standard/tests/file/touch_error.phpt +++ b/ext/standard/tests/file/touch_error.phpt @@ -10,7 +10,7 @@ var_dump(touch(1, 2, 3, 4)); var_dump(touch("/no/such/file/or/directory")); ?> ---EXPECTF-- +--EXPECTF-- Warning: touch() expects at least 1 parameter, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index 688da7ef89..18f9d033b8 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_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt index a3596adc6b..9477a3494e 100644 --- a/ext/standard/tests/file/touch_variation2.phpt +++ b/ext/standard/tests/file/touch_variation2.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) string(6) "mydata" Done diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index 37beb13160..b3f8817656 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; @@ -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 8aae6a0964..8c7db0905b 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; @@ -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 261d95ac94..00203c8f36 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; @@ -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 2e96b73de2..2f1eda71c6 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; @@ -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 a55714565b..6467f5dcdf 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing touch() : usage variation ***\n"; @@ -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 2d428405e9..92b67c24a6 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,38 +26,38 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); @@ -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_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index 4c704ccaca..a448db3ea4 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -26,38 +26,38 @@ $paths = array( $workDir.'/'.$subDirOrFile, './'.$workDir.'/'.$subDirOrFile, $workDir.'/../'.$workDir.'/'.$subDirOrFile, - + // relative bad path $workDir.'/../BADDIR/'.$subDirOrFile, 'BADDIR/'.$subDirOrFile, - + //absolute $cwd.'/'.$workDir.'/'.$subDirOrFile, $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDirOrFile, - + //trailing separators $workDir.'/'.$subDirOrFile.'/', $cwd.'/'.$workDir.'/'.$subDirOrFile.'/', - + // multiple separators $workDir.'//'.$subDirOrFile, $cwd.'//'.$workDir.'//'.$subDirOrFile, - + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -68,7 +68,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index a53dbe4e0d..177de94e48 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c - * Alias to functions: + * Alias to functions: */ $workDir = "touchVar5.tmp"; @@ -29,41 +29,41 @@ $paths = array( $workDir.'\\'.$subDirOrFile, '.\\'.$workDir.'\\'.$subDirOrFile, $workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - + // relative bad path (note p8 msgs differ) $workDir.'\\..\\BADDIR\\'.$subDirOrFile, 'BADDIR\\'.$subDirOrFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\.\\'.$workDir.'\\'.$subDirOrFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile, - //absolute bad path (note p8 msgs differ) + //absolute bad path (note p8 msgs differ) $cwd.'\\BADDIR\\'.$subDirOrFile, - + //trailing separators $workDir.'\\'.$subDirOrFile.'\\', $cwd.'\\'.$workDir.'\\'.$subDirOrFile.'\\', - + // multiple separators $workDir.'\\\\'.$subDirOrFile, $cwd.'\\\\'.$workDir.'\\\\'.$subDirOrFile, - + // Unixified Dir Or File - $unixifiedDirOrFile, - + $unixifiedDirOrFile, + ); - + echo "*** Testing touch() : variation ***\n"; -echo "\n*** testing nonexisting paths ***\n"; +echo "\n*** testing nonexisting paths ***\n"; test_nonexisting($paths); -echo "\n*** testing existing files ***\n"; +echo "\n*** testing existing files ***\n"; test_existing($paths, false); -echo "\n*** testing existing directories ***\n"; +echo "\n*** testing existing directories ***\n"; test_existing($paths, true); @@ -74,7 +74,7 @@ rmdir($workDir); function test_nonexisting($paths) { foreach($paths as $path) { echo "--- testing $path ---\n"; - + if (is_dir($path) || is_file($path)) { echo "FAILED: $path - exists\n"; } @@ -121,7 +121,7 @@ function test_existing($paths, $are_dirs) { if ($res == true) { test_path($path); rmdir($path); - } + } } else { $h = @fopen($path,"w"); @@ -129,12 +129,12 @@ function test_existing($paths, $are_dirs) { fclose($h); test_path($path); unlink($path); - } + } } } } - - + + function test_path($path) { echo "--- testing $path ---\n"; $org_atime = get_atime($path); @@ -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..b44e1ef3c9 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -28,7 +28,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); @@ -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..bb2dbb3255 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -28,7 +28,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo " --\n"; // setting umask umask($mask); - + /* umasking file */ // creating temp file $fp = fopen($filename, "w"); @@ -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 4ce074f81d..843dbe0dc4 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_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index cfe0eb8562..e0c92caeba 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,18 +31,18 @@ $dirs = array( $workDir.'/'.$tmpDir, './'.$workDir.'/'.$tmpDir, $workDir.'/../'.$workDir.'/'.$tmpDir, - + //absolute $cwd.'/'.$workDir.'/'.$tmpDir, $cwd.'/./'.$workDir.'/'.$tmpDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir, - + // multiple separators $workDir.'//'.$tmpDir, $cwd.'//'.$workDir.'//'.$tmpDir, - + ); - + foreach($dirs as $dirToUnlink) { test_link($workDir.'/'.$tmpDir, $dirToLinkTo, $dirToUnlink, true); //soft link @@ -61,9 +61,9 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedDir); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (is_link($tounlink) === false) { 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..558d32a483 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -1,13 +1,13 @@ --TEST-- -Test unlink() function : variation +Test unlink() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation: contexts and relative files ***\n"; @@ -30,10 +30,10 @@ function f_exists($file) { else { echo "$file doesn't exist\n"; } -} +} ?> ===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..1860018102 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : usage variation different types for context ***\n"; @@ -101,7 +101,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // file resource 'file resource' => $fileRes ); @@ -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/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 9ee6b49d2a..8c9fbd895c 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -29,29 +29,29 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); @@ -61,7 +61,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index ab074c7849..e142763cef 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip.. Not for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -31,34 +31,34 @@ $files = array( $workDir.'/'.$tmpFile, './'.$workDir.'/'.$tmpFile, $workDir.'/../'.$workDir.'/'.$tmpFile, - + // relative bad path $workDir.'/../BADDIR/'.$tmpFile, 'BADDIR/'.$tmpFile, - + //absolute $cwd.'/'.$workDir.'/'.$tmpFile, $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, - + //trailing separators $workDir.'/'.$tmpFile.'/', $cwd.'/'.$workDir.'/'.$tmpFile.'/', - + // multiple separators $workDir.'//'.$tmpFile, $cwd.'//'.$workDir.'//'.$tmpFile, - + ); - + foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, true); //soft link - test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link + test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link } unlink($fileToLinkTo); @@ -66,7 +66,7 @@ rmdir($workDir); function test_realfile($file, $tounlink) { touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { @@ -88,9 +88,9 @@ function test_link($linkedfile, $toLinkTo, $tounlink, $softlink) { } else { link($toLinkTo, $linkedfile); - $msg = "hard link"; - } - echo "-- unlinking $msg $tounlink --\n"; + $msg = "hard link"; + } + echo "-- unlinking $msg $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 2331c9edc8..0eaed2e4ca 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com> if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip.. only for Windows'); } -?> +?> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing unlink() : variation ***\n"; @@ -30,38 +30,38 @@ $files = array( $workDir.'\\'.$tmpFile, '.\\'.$workDir.'\\'.$tmpFile, $workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - + // relative bad path $workDir.'\\..\\BADDIR\\'.$tmpFile, 'BADDIR\\'.$tmpFile, - + //absolute $cwd.'\\'.$workDir.'\\'.$tmpFile, $cwd.'\\.\\'.$workDir.'\\'.$tmpFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$tmpFile, - + //trailing separators $workDir.'\\'.$tmpFile.'\\', $cwd.'\\'.$workDir.'\\'.$tmpFile.'\\', - + // multiple separators $workDir.'\\\\'.$tmpFile, $cwd.'\\\\'.$workDir.'\\\\'.$tmpFile, - + // Unixified File - $unixifiedFile, - + $unixifiedFile, + ); - + foreach($files as $fileToUnlink) { $file = $workDir.'/'.$tmpFile; $tounlink = $fileToUnlink; touch($file); - echo "-- removing $tounlink --\n"; + echo "-- removing $tounlink --\n"; $res = unlink($tounlink); if ($res === true) { if (file_exists($tounlink) === false) { diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt index 73f87de613..dfa8376fff 100644 --- a/ext/standard/tests/file/userfilters.phpt +++ b/ext/standard/tests/file/userfilters.phpt @@ -10,7 +10,7 @@ class testfilter extends php_user_filter { $consumed += strlen($bucket->data); stream_bucket_append($out, $bucket); } - return PSFS_PASS_ON; + return PSFS_PASS_ON; } function oncreate() { diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index 419ecc5122..0e649e9a92 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -76,11 +76,11 @@ $DATALEN = strlen($DATA); if ($n != $DATALEN) die("tmpfile stored $n bytes; should be $DATALEN!"); -class uselessstream +class uselessstream { } -class mystream +class mystream { public $path; public $mode; @@ -102,7 +102,7 @@ class mystream $this->position = strlen($GLOBALS[$this->varname]); else $this->position = 0; - + return true; } @@ -228,7 +228,7 @@ for ($i = 0; $i < 256; $i++) { $seeks[] = array($whence, $offset, $position); } -/* we compare the results of fgets using differing line lengths to +/* we compare the results of fgets using differing line lengths to * test the fgets layer also */ $line_lengths = array(1024, 256, 64, 16); $fail_count = 0; @@ -266,7 +266,7 @@ foreach($line_lengths as $line_length) { var_dump($dat); break; } - + $j++; } if ($fail_count) diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt index 20e10f5c5b..4454ee1173 100644 --- a/ext/standard/tests/file/windows_acls/bug44859.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_writable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt index 583e63a2a6..514953f42e 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt b/ext/standard/tests/file/windows_acls/bug44859_3.phpt index 35db1f29be..ed57abba07 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt @@ -1,7 +1,7 @@ --TEST-- bug #44859 (incorrect result with NTFS ACL permissions, is_executable) --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt index 452581fa05..bf640fa660 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt @@ -3,7 +3,7 @@ bug #44859 (incorrect result with NTFS ACL permissions, is_readable) --CREDITS-- Venkat Raman Don --SKIPIF-- -<?php +<?php include_once __DIR__ . '/common.inc'; skipif(); ?> diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt index b1bc415f05..d5b184158e 100644 --- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt @@ -27,7 +27,7 @@ foreach ($paths as $d) { } $myDirectory = opendir($prefix); -while($entryName = readdir($myDirectory)) { +while($entryName = readdir($myDirectory)) { echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n"; } closedir($myDirectory); diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt index 6d9367f857..784cffadb7 100644 --- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt @@ -36,7 +36,7 @@ var_dump(unlink($fnw)); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index 418c35cd25..2d74bfc8b3 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -29,7 +29,7 @@ if ($return_code != true) die("Failed to open file: " . $return_code); $return_code = $zipfile->addfile($testfile_zip, basename($testfile_zip)); if ($return_code != true) print("Failed to add file: " . $zipfile->getStatusString()); - + $return_code = $zipfile->close(); if ($return_code != true) die("Failed to close archive: " . $zipfile->getStatusString()); diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index 6517cf88c1..e291dd0855 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 path +Test fopen() for reading big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index 98d4e0c89b..74202fa966 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 path +Test mkdir/rmdir big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 406b925555..3be40bf61e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index 54710fc3c8..3002b50c22 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 to UTF-8 path +Test fopen() for reading big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index 4e1ef94c00..abf3a76cc2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 to UTF-8 path +Test mkdir/rmdir big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index 3b3b8a558a..f204790e8e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt index a5dea1c9b8..7a6496a619 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt index ae7eff4a13..bd4421e7a2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt index 45531b6d6b..488343d8d1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt index c70570b2b0..84b05b71d9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt index a7df51695f..3759daa71d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt @@ -37,7 +37,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt index 75e5c55ca9..7e1998ba2a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt @@ -38,7 +38,7 @@ remove_data("dir_cp1250"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 485ff119ef..7dfd7eadbf 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 path +Test fopen() for reading CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index db0c9a690c..3abce0d0d5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 path +Test mkdir/rmdir CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 7dd32c5a90..2a3b7390b1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 path +Test fopen() for write CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 14b5176415..13395d1017 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 to UTF-8 path +Test fopen() for reading CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index 7b5f71b84e..193e2fdc74 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 to UTF-8 path +Test mkdir/rmdir CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index 84ecdbff9e..e552464214 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 to UTF-8 path +Test fopen() for write CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index 2510a2d2de..b638eb4822 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index 3b55e18c67..e44849b061 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index 98e5852b67..c0b685c55b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 6fe0d968f7..85a1c41f07 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -19,9 +19,9 @@ internal_encoding=cp1252 #vim: set encoding=cp1252 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "gefäß"; +$item = "gefäß"; $prefix = create_data("file", $item, 1252); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -34,7 +34,7 @@ remove_data("file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\gefäß" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index ef5dc9397d..bdb1a7a878 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "hallo " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index 2a34746183..059ab8dd8f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index 293824d550..9ea2485eeb 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index c5e075a944..cae3426e75 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(4) "hola" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index 969a115392..cacaf5d36d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index 6119213289..3ac634134a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 24beb0d31a..12ae1ac7cd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 path +Test fopen() for reading cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 854910bc31..9049a65ee1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 path +Test mkdir/rmdir cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 79892e8ae4..4c39fb5bda 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index 950c4784d8..0fbc78fc12 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 to UTF-8 path +Test fopen() for reading cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index 25aeb513ba..ddc79b1204 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 to UTF-8 path +Test mkdir/rmdir cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index bd8fc22ba3..6e28c89e0c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1253 to UTF-8 path +Test fopen() for write cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 4f160c1370..5fbcb74602 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 path +Test fopen() for reading cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 5a72058097..314f78ecb8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index 21f87c501a..d2a04d905a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 path +Test fopen() for write cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index 7fcb0ff66d..13357217c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -19,7 +19,7 @@ default_charset=cp1254 #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlý iþleri"; @@ -35,7 +35,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlý iþleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index 7a3d496f9f..9a92099cd0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 to UTF-8 path +Test fopen() for reading cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 0cb73207e8..551a0f2235 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index ea4950974c..12df56b11e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 to UTF-8 path +Test fopen() for write cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt index 0c330ea445..cbaba44e4e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt @@ -16,7 +16,7 @@ skip_if_no_required_exts(); #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlı iÅŸleri"; @@ -32,7 +32,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlı iÅŸleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index 01b4f7732d..8a685b68c4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 path +Test fopen() for reading cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 991d2ab615..391a282a69 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 path +Test mkdir/rmdir cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index 276af84a91..2f38398bb5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 path +Test fopen() for write cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index e33616ddd3..31a48dbc0c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 to UTF-8 path +Test fopen() for reading cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index b241210faa..b6a59e4be3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 to UTF-8 path +Test mkdir/rmdir cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 10fef62404..53f83b3a0e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 to UTF-8 path +Test fopen() for write cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 617ebedddd..6b473abb54 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index 341c0c01a2..1a4233f2c2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index e8cf5709a7..5c25d60fc8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index 32596c2bd5..b021df7fa4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index fd0204aace..2fb10a97a5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index ef0229a2e9..ba70e1a77e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt index efc43f3513..52f080e2c2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt @@ -47,7 +47,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sà»ç¹á¿éÁ·Õè·´Êͺ1.txt string(%d) "à»ç¹á¿éÁ·Õè·´Êͺ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index aa877d7406..6cb2fb7eee 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -19,10 +19,10 @@ internal_encoding=cp874 #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; +$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; $prefix = create_data("file_cp874", $item, 874); $fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item; @@ -35,7 +35,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\à»ç¹á¿éÁ·Õè·´Êͺ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt index 2c244997b6..8d32f88a8c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt @@ -44,7 +44,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sเป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š1.txt string(%d) "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt index 13ec027748..843c66f4a2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š11"; +$item = "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š11"; $prefix = create_data("file_cp874", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 48e55981ca..1835f0d360 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 path +Test fopen() for reading cp932 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index b177e2d1e2..f7f24c045d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index 595f86213a..d529f6a484 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index 95992ae79f..db31c1ad7a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -19,7 +19,7 @@ internal_encoding=cp932 #vim: set encoding=cp932 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77"; // cp932 string @@ -35,7 +35,7 @@ remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index 5e0e67b662..a04c14d276 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 to UTF-8 path +Test fopen() for reading cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 2092e40da0..9b13922a7a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp932 to UTF-8 path +Test mkdir/rmdir cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index bd9b1791ea..fbe290468c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp932 to UTF-8 path +Test fopen() for write cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index 46db0ebc4b..bcaa31353f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 path +Test fopen() for reading cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index 9eb1f08217..9edb6d1301 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 path +Test mkdir/rmdir cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index eedee97bd0..2c05c313e9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 path +Test fopen() for write cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index b0b709c0cc..554a05d94c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 to UTF-8 path +Test fopen() for reading cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 2c4b2876c5..79bdfa4283 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 to UTF-8 path +Test mkdir/rmdir cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index b260b7b37f..22b64c31f9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 to UTF-8 path +Test fopen() for write cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 4b2bae974f..0ff640aa35 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading eucjp to UTF-8 path +Test fopen() for reading eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index db3f1d861b..5a481e8d12 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir eucjp to UTF-8 path +Test mkdir/rmdir eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 0d06fb2489..50727a9d71 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write eucjp to UTF-8 path +Test fopen() for write eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index 51f1bb945b..32b6f9b066 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading Kartuli UTF-8 path +Test fopen() for reading Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index ff32d75869..a92e7c34ed 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir Kartuli UTF-8 path +Test mkdir/rmdir Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index 192072760c..edfb279cd2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write Kartuli UTF-8 path +Test fopen() for write Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt index 8f08357792..46077258d1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt @@ -16,10 +16,10 @@ skip_if_no_required_exts(); #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "ქáƒáƒ თველები55"; +$item = "ქáƒáƒ თველები55"; $prefix = create_data("file_kartuli", $item); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -32,7 +32,7 @@ remove_data("file_kartuli"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ქáƒáƒ თველები55" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt index 688fc6caca..6bc28110e0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt @@ -12,14 +12,14 @@ skip_if_no_required_exts("mbstring"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt index b2af71aa76..94518e7a65 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt @@ -11,7 +11,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt index bcae2c53bc..3be1850c5a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt @@ -11,7 +11,7 @@ skip_if_no_required_exts("mbstring"); ?> --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('x', 50) . "ü"; $how_many = 32; @@ -19,7 +19,7 @@ $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s"; $p .= DIRECTORY_SEPARATOR; -} +} /* path doesn't exist at this point! */ $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p; 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 5ea66058ea..53b6f40b19 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 6eb484fcd0..6285e1a6ac 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/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt index 5cc697c0fc..2453538190 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt @@ -1,5 +1,5 @@ --TEST-- -Mkdir with path length < 260 and > 248 has be a long path +Mkdir with path length < 260 and > 248 has be a long path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -15,13 +15,13 @@ if (strlen($start) > 260 || strlen($start) > 248) { --FILE-- <?php -$p = ""; +$p = ""; $s = str_repeat('a', 50); $how_many = 32; for ($i = 0; $i < $how_many; $i++) { $p .= "$s\\"; -} +} $start = realpath(dirname(__FILE__)); if (strlen($start) <= 248) { diff --git a/ext/standard/tests/filters/001.phpt b/ext/standard/tests/filters/001.phpt index fbfdda2385..afbcdcfdd5 100644 --- a/ext/standard/tests/filters/001.phpt +++ b/ext/standard/tests/filters/001.phpt @@ -12,7 +12,7 @@ var_dump(stream_filter_register("", array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: stream_filter_register(): Filter name cannot be empty in %s on line %d bool(false) 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/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 75b6829582..3744b72467 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stream_filter_remove() function : basic functionality +Test stream_filter_remove() function : basic functionality --SKIPIF-- <?php $filters = stream_get_filters(); @@ -8,9 +8,9 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available --FILE-- <?php /* Prototype : bool stream_filter_remove(resource stream_filter) - * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing stream_filter_remove() : basic functionality ***\n"; @@ -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/stream_filter_remove_error.phpt b/ext/standard/tests/filters/stream_filter_remove_error.phpt index 37820a99c4..9cbb925855 100644 --- a/ext/standard/tests/filters/stream_filter_remove_error.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stream_filter_remove() function : error conditions +Test stream_filter_remove() function : error conditions --SKIPIF-- <?php $filters = stream_get_filters(); @@ -8,9 +8,9 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available --FILE-- <?php /* Prototype : bool stream_filter_remove(resource stream_filter) - * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c - * Alias to functions: + * Alias to functions: */ $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; 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/001.phpt b/ext/standard/tests/general_functions/001.phpt index 307122e1cb..bfd82e55b0 100644 --- a/ext/standard/tests/general_functions/001.phpt +++ b/ext/standard/tests/general_functions/001.phpt @@ -1,7 +1,7 @@ --TEST-- sprintf() function --FILE-- -<?php +<?php $agent = sprintf("%.5s", "James Bond, 007"); diff --git a/ext/standard/tests/general_functions/003.phpt b/ext/standard/tests/general_functions/003.phpt index 0388cf95b0..7ad90c8b5a 100644 --- a/ext/standard/tests/general_functions/003.phpt +++ b/ext/standard/tests/general_functions/003.phpt @@ -1,11 +1,11 @@ --TEST-- levenshtein() function test --FILE-- -<?php +<?php function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) { - if($cost1==0) + if($cost1==0) $result=levenshtein($text1,$text2); else $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3); @@ -16,8 +16,8 @@ function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) { echo "for '$text1'/'$text2' "; if($cost1) echo "($cost1:$cost2:$cost3)"; echo "\n"; - - return 1; + + return 1; } $n=0; diff --git a/ext/standard/tests/general_functions/004.phpt b/ext/standard/tests/general_functions/004.phpt index 5468ca99f0..40b47cc1ca 100644 --- a/ext/standard/tests/general_functions/004.phpt +++ b/ext/standard/tests/general_functions/004.phpt @@ -1,7 +1,7 @@ --TEST-- fgetcsv() with tab delimited fields (BUG #8258) --FILE-- -<?php +<?php chdir(dirname(__FILE__)); $fp=fopen("004.data","r"); while($a=fgetcsv($fp,100,"\t")) { diff --git a/ext/standard/tests/general_functions/007.phpt b/ext/standard/tests/general_functions/007.phpt index 02fc6c6480..f755ab4f80 100644 --- a/ext/standard/tests/general_functions/007.phpt +++ b/ext/standard/tests/general_functions/007.phpt @@ -5,7 +5,7 @@ MD5 / Base64 function test($str) { $res = md5(base64_decode(base64_encode($str)))."\n"; return $res; -} +} echo test(""); echo test("a"); echo test("abc"); diff --git a/ext/standard/tests/general_functions/009.phpt b/ext/standard/tests/general_functions/009.phpt index 39dc2189b3..e80d36140d 100644 --- a/ext/standard/tests/general_functions/009.phpt +++ b/ext/standard/tests/general_functions/009.phpt @@ -5,7 +5,7 @@ SHA1 function test($str) { $res = sha1($str)."\n"; return $res; -} +} echo test(""); echo test("a"); echo test("abc"); 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/bug27678.phpt b/ext/standard/tests/general_functions/bug27678.phpt index 7f6597d288..6f95509e14 100644 --- a/ext/standard/tests/general_functions/bug27678.phpt +++ b/ext/standard/tests/general_functions/bug27678.phpt @@ -11,6 +11,6 @@ var_dump(strlen($num) == 3); // $num == 'inf' echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- bool(true) Done diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt index 12776448b3..7d154708fa 100644 --- a/ext/standard/tests/general_functions/bug31190.phpt +++ b/ext/standard/tests/general_functions/bug31190.phpt @@ -4,7 +4,7 @@ Bug #31190 (exception in call_user_func_array()) <?php class test { - function throwException() { throw new Exception("Hello World!\n"); + function throwException() { throw new Exception("Hello World!\n"); } } $array = array(new test(), 'throwException'); 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..248608e008 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -9,17 +9,17 @@ class TestClass { echo __METHOD__ . "()\n"; } - + function whee() { array_map(array('TestClass', 'test'), array('array_value')); } - + function whee4() { call_user_func(array('TestClass', 'test')); } - + static function whee5() { call_user_func(array('TestClass', 'test')); @@ -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..9500573e8d 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/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt index b9bb5856d8..0ffc8d58f6 100644 --- a/ext/standard/tests/general_functions/bug41037.phpt +++ b/ext/standard/tests/general_functions/bug41037.phpt @@ -14,7 +14,7 @@ declare (ticks=1) { echo "Done\n"; } ?> ---EXPECTF-- +--EXPECTF-- hello Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d Done diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index a9ead940c1..000e9d347d 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..120d9400b6 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 +Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 --FILE-- <?php @@ -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/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt index 34eb2f855c..d2c7f10ca4 100644 --- a/ext/standard/tests/general_functions/bug43293_1.phpt +++ b/ext/standard/tests/general_functions/bug43293_1.phpt @@ -4,7 +4,7 @@ Bug #43293 (Multiple segfaults in getopt()) register_argc_argv=Off --FILE-- <?php -$argv = array(1, 2, 3); +$argv = array(1, 2, 3); var_dump(getopt("abcd")); var_dump($argv); $argv = null; diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt index 290de2b1b1..53290a7a30 100644 --- a/ext/standard/tests/general_functions/bug44667.phpt +++ b/ext/standard/tests/general_functions/bug44667.phpt @@ -11,23 +11,23 @@ $descriptor_spec = array( 0 => array('pipe', 'rb'), 1 => array('pipe', 'wb'), ); - + $proc = proc_open('cat', $descriptor_spec, $pipes); - + fwrite($pipes[0], 'Hello', 5); fflush($pipes[0]); fclose($pipes[0]); - + $result = fread($pipes[1], 5); fclose($pipes[1]); - + proc_close($proc); - -echo "Result is: ", $result, "\n"; + +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..ecc13ab07a 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_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt index 51a079ad53..4a4845aa1d 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt @@ -1,11 +1,11 @@ --TEST-- -Test call_user_func_array() function : first parameter variation +Test call_user_func_array() function : first parameter variation --FILE-- <?php /* Prototype : mixed call_user_func_array(string function_name, array parameters) - * Description: Call a user function which is the first parameter with the arguments contained in array + * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing call_user_func_array() : usage variation ***\n"; 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..51a5d74ae2 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 @@ -1,11 +1,11 @@ --TEST-- -Test call_user_func_array() function : second parameter variation +Test call_user_func_array() function : second parameter variation --FILE-- <?php /* Prototype : mixed call_user_func_array(string function_name, array parameters) - * Description: Call a user function which is the first parameter with the arguments contained in array + * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing call_user_func_array() : usage variation ***\n"; @@ -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..3a077f2db6 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/closures_002.phpt b/ext/standard/tests/general_functions/closures_002.phpt index e0ef5121c0..6df389bbb1 100644 --- a/ext/standard/tests/general_functions/closures_002.phpt +++ b/ext/standard/tests/general_functions/closures_002.phpt @@ -16,7 +16,7 @@ echo "$i\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Test %d %d 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..5c6fe36523 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_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt Binary files differindex cc3540c406..4fe2f4c95b 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt index 4f82039e2d..4929362613 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt @@ -3,7 +3,7 @@ Test debug_zval_dump() function : error conditions --FILE-- <?php /* Prototype: void debug_zval_dump ( mixed $variable ); - Description: Dumps a string representation of an internal zend value + Description: Dumps a string representation of an internal zend value to output. */ 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..e2c84dae9b 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt @@ -9,7 +9,7 @@ Test debug_zval_dump() function : working on objects */ /* Prototype: void zval_dump( $value ); - Description: use debug_zval_dump() to display the objects and its + Description: use debug_zval_dump() to display the objects and its reference count */ function zval_dump( $values ) { $counter = 1; @@ -76,7 +76,7 @@ class contains_object_class } /* creating new object $obj */ -$obj = new contains_object_class(); +$obj = new contains_object_class(); $obj1 = & $obj; //object $obj1 references object $obj $obj2 = & $obj; $obj3 = & $obj2; @@ -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 f637bfc2e9..849d8b492c 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -3,7 +3,7 @@ Test debug_zval_dump() function : usage variations --FILE-- <?php /* Prototype: void debug_zval_dump ( mixed $variable ); - Description: Dumps a string representation of an internal zend value + Description: Dumps a string representation of an internal zend value to output. */ @@ -49,7 +49,7 @@ debug_zval_dump($ref_first_var); echo "\n-- Value of \$first_var --\n"; debug_zval_dump($first_var); -unset($ref_first_var); +unset($ref_first_var); /* dump value and reference count of $first_var, $ref_first_var here $ref_first_var is unset */ @@ -71,7 +71,7 @@ debug_zval_dump($var_3); /* unsetting $var_3 */ unset($var_3); -echo "\n-- Value of \$var_3: (after unsetting var_3) --\n"; +echo "\n-- Value of \$var_3: (after unsetting var_3) --\n"; debug_zval_dump($var_3); echo "\n-- Value of \$var_2: --\n"; debug_zval_dump($var_2); @@ -94,7 +94,7 @@ $misc_values = array ( /* nulls */ NULL, null, - + /* unset variable */ @$unset_var, diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt index 57115a2b72..c53b5153f8 100644 --- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt +++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt @@ -13,7 +13,7 @@ enable_dl=1 <?php var_dump(dl(str_repeat("a", 8376757))); ?> ---EXPECTF-- +--EXPECTF-- Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt index 675affb625..02936c84cb 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -15,7 +15,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL NULL array(4) { diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index 71f068f104..95a6cf434c 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -13,7 +13,7 @@ var_dump(error_get_last()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL Warning: error_get_last() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt index d7b27cd8de..f85f4a4195 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt index 7ee46ea9a2..d97c1a956b 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt index 1efa72d992..c26915c923 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt @@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) /* Prototype : string escapeshellarg ( string $arg ) * Description: Escape a string to be used as a shell argument. * Source code: ext/standard/exec.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for escapeshellarg() function\n"; diff --git a/ext/standard/tests/general_functions/escapeshellarg_error.phpt b/ext/standard/tests/general_functions/escapeshellarg_error.phpt index 8746b5884a..139a445202 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_error.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_error.phpt @@ -38,7 +38,7 @@ var_dump( escapeshellarg($fp)); fclose($fp); echo "\n-- Testing escapeshellarg() function with a array supplied for argument --\n"; -$arg = array(1,2,3); +$arg = array(1,2,3); var_dump( escapeshellarg($arg)); ?> diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt index f4e9439b14..8f8bc19d8f 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt index 6f3b6a9f32..32431a581a 100644 --- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt +++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', 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/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt index 1bb4d1151c..d7bdffd6ae 100644 --- a/ext/standard/tests/general_functions/floatval.phpt +++ b/ext/standard/tests/general_functions/floatval.phpt @@ -7,7 +7,7 @@ Testing floatval() and its alias doubleval() Functions */ echo "*** Testing floatval() with valid float values ***\n"; -// different valid float values +// different valid float values $valid_floats = array( 0.0, 1.0, @@ -32,7 +32,7 @@ $valid_floats = array( -.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $value ) { echo "\n*** Testing doubleval() with valid float values ***\n"; -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -57,7 +57,7 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( -2147483648, // max negative integer value 2147483648, // max positive integer value @@ -76,7 +76,7 @@ $not_float_types = array ( NULL, null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( floatval($type) ); @@ -85,7 +85,7 @@ foreach ($not_float_types as $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( doubleval($type) ); @@ -99,10 +99,10 @@ echo "\n*** Testing error conditions ***\n"; var_dump( floatval() ); var_dump( doubleval() ); -//arguments more than expected +//arguments more than expected var_dump( floatval(TRUE, FALSE) ); var_dump( doubleval(TRUE, FALSE) ); - + echo "\nDone\n"; diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt index 71f4e0d139..129aa87b3c 100644 --- a/ext/standard/tests/general_functions/floatval_basic.phpt +++ b/ext/standard/tests/general_functions/floatval_basic.phpt @@ -8,7 +8,7 @@ precision = 14 * Description: Returns the float value of var. */ -// different valid float values +// different valid float values $valid_floats = array( "0.0" => 0.0, "1.0" => 1.0, @@ -33,7 +33,7 @@ $valid_floats = array( "-.5e+7" =>-.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ echo "*** Testing floatval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $key => $value ) { var_dump( floatval($value) ); } -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ echo "\n*** Testing doubleval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index 2aafa0684c..aa808cfba1 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -14,11 +14,11 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( "-2147483648" => -2147483648, // max negative integer value "2147483647" => 2147483648, // max positive integer value - "file resoruce" => $fp, + "file resoruce" => $fp, "directory resource" => $dfp, "\"0.0\"" => "0.0", // string "\"1.0\"" => "1.0", @@ -33,7 +33,7 @@ $not_float_types = array ( "NULL" => NULL, "null" => null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ echo "\n*** Testing floatval() on non floating types ***\n"; foreach ($not_float_types as $key => $type ) { @@ -43,7 +43,7 @@ foreach ($not_float_types as $key => $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $key => $type ) { echo "\n-- Iteration : $key --\n"; 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..00a24597f8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -21,7 +21,7 @@ EOT; $variation_array = array( 'session.use_cookies', - 'session.serialize_handler', + 'session.serialize_handler', 'session.save_handler' ); @@ -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 54f0868c7f..9de39c18d0 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_defined_constants() function : basic functionality +Test get_defined_constants() function : basic functionality --FILE-- <?php /* Prototype : array get_defined_constants ([ bool $categorize ] ) * Description: Returns an associative array with the names of all the constants and their values * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_defined_constants() : basic functionality ***\n"; @@ -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_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt index b093ed1e0c..1092712ee9 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_defined_constants() function : error conditions +Test get_defined_constants() function : error conditions --FILE-- <?php /* Prototype : array get_defined_constants ([ bool $categorize ] ) * Description: Returns an associative array with the names of all the constants and their values * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_defined_constants() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt index b809dc9d55..3aa6e72a92 100644 --- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt @@ -3,47 +3,47 @@ Test get_defined_vars() function --FILE-- <?php /* Prototype: array get_defined_vars ( void ) - Description: This function returns a multidimensional array containing a list of all defined - variables, be them environment, server or user-defined variables, within the scope that + Description: This function returns a multidimensional array containing a list of all defined + variables, be them environment, server or user-defined variables, within the scope that get_defined_vars() is called. */ echo "Simple testcase for get_defined_vars() function\n\n"; function f1() { - echo "\n-- Function f1() called --\n"; + echo "\n-- Function f1() called --\n"; $vars = get_defined_vars(); - + if (count($vars) != 0) { - echo "TEST FAILED\n"; - } - - echo "\n-- ..define some local variables --\n"; + echo "TEST FAILED\n"; + } + + echo "\n-- ..define some local variables --\n"; $i = 123; $f = 123.456; $b = false; - $s = "Hello World"; + $s = "Hello World"; $arr = array(1,2,3,4); - var_dump( get_defined_vars() ); + var_dump( get_defined_vars() ); f2(); } function f2() { - echo "\n -- Function f2() called --\n"; + echo "\n -- Function f2() called --\n"; $vars= get_defined_vars(); - + if (count($vars) != 0) { - echo "TEST FAILED\n"; + echo "TEST FAILED\n"; } - - echo "\n-- ...define some variables --\n"; + + echo "\n-- ...define some variables --\n"; $i = 456; $f = 456.678; $b = true; - $s = "Goodnight"; - $arr = array("foo", "bar"); + $s = "Goodnight"; + $arr = array("foo", "bar"); var_dump( get_defined_vars() ); - + echo "\n-- ...define some more variables --\n"; $i1 = 456; $f1 = 456.678; @@ -56,8 +56,8 @@ echo "\n-- Get variables at global scope --\n"; $vars = get_defined_vars(); if (count($vars) == 0) { - echo "TEST FAILED - Global variables missing at global scope\n"; -} + echo "TEST FAILED - Global variables missing at global scope\n"; +} // call a function f1(); 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..2dbe332ccc 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -5,7 +5,7 @@ Test get_extension_funcs() function: basic test /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for get_extension_funcs() function\n"; @@ -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_extension_funcs_error.phpt b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt index 44bd822d12..33e32a66a5 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_extension_funcs() function : error conditions +Test get_extension_funcs() function : error conditions --FILE-- <?php /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_extension_funcs() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt index ac4568c621..c575737264 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_extension_funcs() function : error conditions +Test get_extension_funcs() function : error conditions --FILE-- <?php /* Prototype : array get_extension_funcs ( string $module_name ) * Description: Returns an array with the names of the functions of a module. * Source code: Zend/zend_builtin_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing get_extension_funcs() function: with unexpected inputs for 'module_name' argument ***\n"; @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt index b777a2a44d..999862bc64 100644 --- a/ext/standard/tests/general_functions/get_include_path_basic.phpt +++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt @@ -17,7 +17,7 @@ if (ini_get("include_path") == get_include_path()) { echo "PASSED\n"; } else { echo "FAILED\n"; -} +} echo "\nError cases:\n"; var_dump(get_include_path(TRUE)); diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt index 8ce2323a39..52b2136f5b 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_loaded_extensions() function : basic functionality +Test get_loaded_extensions() function : basic functionality --FILE-- <?php /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) * Description: Returns an array with the names of all modules compiled and loaded * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_loaded_extensions() : basic functionality ***\n"; diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt index 1728dea23f..d731046dc6 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_loaded_extensions() function : error conditions +Test get_loaded_extensions() function : error conditions --FILE-- <?php /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) * Description: Returns an array with the names of all modules compiled and loaded * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_loaded_extensions() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt index add1ea141c..75cde18b08 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt @@ -9,9 +9,9 @@ Test get_magic_quotes_gpc() function echo "Simple testcase for get_magic_quotes_gpc() function\n"; var_dump(get_magic_quotes_gpc()); -echo "\n-- Error cases --\n"; +echo "\n-- Error cases --\n"; // no checks on number of args -var_dump(get_magic_quotes_gpc(true)); +var_dump(get_magic_quotes_gpc(true)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt index 620e97cf83..4106ee9eea 100644 --- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt +++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt @@ -10,9 +10,9 @@ echo "Simple testcase for get_magic_quotes_runtime() function\n"; var_dump(get_magic_quotes_runtime()); -echo "\n-- Error cases --\n"; +echo "\n-- Error cases --\n"; // no checks on number of args -var_dump(get_magic_quotes_runtime(true)); +var_dump(get_magic_quotes_runtime(true)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt index 58a49e713f..7ff4aec2c3 100644 --- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test get_resource_type() function : basic functionality +Test get_resource_type() function : basic functionality --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : basic functionality ***\n"; $res = fopen(__FILE__, "r"); -var_dump(get_resource_type($res)); +var_dump(get_resource_type($res)); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt index a010f7eba4..40dcf07799 100644 --- a/ext/standard/tests/general_functions/get_resource_type_error.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test get_resource_type() function : error conditions +Test get_resource_type() function : error conditions --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : error conditions ***\n"; 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 c620ba9bb0..cd974fd5e0 100644 --- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt @@ -3,16 +3,16 @@ Test get_resource_type() function : usage variations - different data types as h --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c - */ + */ echo "*** Testing get_resource_type() : variation test ***\n"; class Hello { public function SayHello($arg) { echo "Hello\n"; - } + } } $res = fopen(__FILE__, "r"); @@ -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/getmypid_basic.phpt b/ext/standard/tests/general_functions/getmypid_basic.phpt index 3f4d9cd5cf..869eb59442 100644 --- a/ext/standard/tests/general_functions/getmypid_basic.phpt +++ b/ext/standard/tests/general_functions/getmypid_basic.phpt @@ -5,7 +5,7 @@ Test getmypid() function: basic test /* Prototype : int getmypid ( void ) * Description: Gets the current PHP process ID. * Source code: ext/standard/pageinfo.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for getmypid() function\n"; diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt index e716414eb3..e9fc8c6f6e 100644 --- a/ext/standard/tests/general_functions/getrusage.phpt +++ b/ext/standard/tests/general_functions/getrusage.phpt @@ -13,11 +13,11 @@ var_dump(getrusage(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index a2b03ee07a..b2379a7663 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -7,7 +7,7 @@ Test getrusage() function: basic test /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ echo "Simple testcase for getrusage() function\n"; @@ -16,11 +16,11 @@ $dat = getrusage(); if (!is_array($dat)) { echo "TEST FAILED : getrusage should return an array\n"; -} +} -// echo the fields which are common to all platforms +// echo the fields which are common to all platforms echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n"; -echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; +echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt index ce2bbc815e..a40a43449a 100644 --- a/ext/standard/tests/general_functions/getrusage_error.phpt +++ b/ext/standard/tests/general_functions/getrusage_error.phpt @@ -7,7 +7,7 @@ Test getrusage() function : error conditions - incorrect number of args /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ /* @@ -29,7 +29,7 @@ $array_arg = array(1,2,3); $dat = getrusage($array_arg); echo "\n-- Testing getrusage() function with invalid argument - OBJECT --\n"; -class classA +class classA { function __toString() { return "ClassAObject"; @@ -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/getrusage_variation1.phpt b/ext/standard/tests/general_functions/getrusage_variation1.phpt index 0c072ed6e0..568c9c7383 100644 --- a/ext/standard/tests/general_functions/getrusage_variation1.phpt +++ b/ext/standard/tests/general_functions/getrusage_variation1.phpt @@ -3,14 +3,14 @@ Test getrusage() function : usage variation - diff data types as $who arg --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); -if (!function_exists("getrusage")) die("skip"); +if (!function_exists("getrusage")) die("skip"); ?> --FILE-- <?php /* Prototype : array getrusage ([ int $who ] ) * Description: Gets the current resource usages * Source code: ext/standard/microtime.c - * Alias to functions: + * Alias to functions: */ @@ -50,13 +50,13 @@ $inputs = array( false, TRUE, FALSE, - + // string data /*16*/ "0", '1', "1232456", "1.23E4", - + // undefined data /*20*/ @$undefined_var, diff --git a/ext/standard/tests/general_functions/getservbyname_error.phpt b/ext/standard/tests/general_functions/getservbyname_error.phpt index ec9b7795a5..eaeec64888 100644 --- a/ext/standard/tests/general_functions/getservbyname_error.phpt +++ b/ext/standard/tests/general_functions/getservbyname_error.phpt @@ -8,7 +8,7 @@ Danilo Sanchi (sanchi@grupporetina.com) --FILE-- <?php $service = "www"; -$protocol = "tcp"; +$protocol = "tcp"; $extra_arg = 12; var_dump(getservbyname($service, $protocol, $extra_arg ) ); var_dump(getservbyname($service)); 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..986d7d5973 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 2 with string values. echo "*** Test substituting argument 2 with string values ***\n"; -$service = "www"; +$service = "www"; $heredoc = <<<EOT @@ -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..7c00b1e7f7 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with boolean values. echo "*** Test substituting argument 1 with boolean values ***\n"; -$protocol = "tcp"; +$protocol = "tcp"; $variation_array = array( @@ -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..f06a6ec884 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt @@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with int values. echo "*** Test substituting argument 1 with int values ***\n"; -$protocol = "tcp"; +$protocol = "tcp"; $variation_array = array ( @@ -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_error.phpt b/ext/standard/tests/general_functions/getservbyport_error.phpt index 7d4107cedf..e2c245b7ea 100644 --- a/ext/standard/tests/general_functions/getservbyport_error.phpt +++ b/ext/standard/tests/general_functions/getservbyport_error.phpt @@ -8,7 +8,7 @@ Simone Gentili (sensorario@gmail.com) --FILE-- <?php $port = 80; -$protocol = "tcp"; +$protocol = "tcp"; $extra_arg = 12; var_dump(getservbyport( $port, $protocol, $extra_arg ) ); var_dump(getservbyport($port)); diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt index cc4a9afb26..3073f66430 100644 --- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt +++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt @@ -18,23 +18,23 @@ Simone Gentili (sensorario@gmail.com) var_dump(getservbyport( 2, 2)); var_dump(getservbyport( "80", "tcp")); var_dump(getservbyport( new stdClass(), new stdClass())); - + ?> --EXPECTF-- 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_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt index 325e91e47f..2c6aac6875 100644 --- a/ext/standard/tests/general_functions/gettype_settype_error.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt @@ -1,12 +1,12 @@ --TEST-- -Test gettype() & settype() functions : error conditions +Test gettype() & settype() functions : error conditions --FILE-- <?php /* Prototype: string gettype ( mixed $var ); Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test different error conditions of settype() and gettype() functions */ @@ -16,14 +16,14 @@ echo "**** Testing gettype() and settype() functions ****\n"; echo "\n*** Testing gettype(): error conditions ***\n"; //Zero arguments var_dump( gettype() ); -// args more than expected +// args more than expected var_dump( gettype( "1", "2" ) ); echo "\n*** Testing settype(): error conditions ***\n"; //Zero arguments var_dump( settype() ); -// args more than expected +// args more than expected $var = 10.5; var_dump( settype( $var, $var, "int" ) ); @@ -32,7 +32,7 @@ var_dump( settype( $var, "unknown" ) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- **** Testing gettype() and settype() functions **** *** Testing gettype(): error conditions *** diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index ada73f0159..6265d0a373 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -12,19 +12,19 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ -/* Test usage variation of gettype() and settype() functions: - settype() to null type. +/* Test usage variation of gettype() and settype() functions: + settype() to null type. Set type of the data to "null" and verify using gettype Following are performed in the listed sequence: - get the current type of the variable + get the current type of the variable set the type of the variable to "null type" dump the variable to see its new data get the new type of the variable */ - + /* function to handle catchable errors */ function foo($errno, $errstr, $errfile, $errline) { // var_dump($errstr); @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -/* test conversion to null type */ +/* test conversion to null type */ $type = "null"; echo "\n*** Testing gettype() & settype() functions : usage variations ***\n"; @@ -164,22 +164,22 @@ $loop_count = 1; foreach ($var_values as $var) { echo "-- Iteration $loop_count --\n"; $loop_count++; - // get the current data type + // get the current data type var_dump( gettype($var) ); - - // convert it to null + + // convert it to null var_dump( settype($var, $type) ); - // dump the converted data + // dump the converted data var_dump( $var ); - + // check the new type after conversion var_dump( gettype($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..ba3a0dbfec 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -15,7 +15,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -35,8 +35,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -60,15 +60,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -82,7 +82,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -128,11 +128,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -158,7 +158,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "integer", "int" @@ -173,13 +173,13 @@ foreach ($types as $type) { // get the current data type var_dump( gettype($var) ); - + // convert it to new type var_dump( settype($var, $type) ); - + // dump the converted $var var_dump( $var ); - + // get the new type of the $var var_dump( gettype($var) ); } @@ -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..29c1463fb1 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "float", "double" @@ -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..6f7cc23df4 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -61,15 +61,15 @@ class class_with_no_member { // no member(s) } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -86,7 +86,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -133,12 +133,12 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 0.0, 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -163,7 +163,7 @@ $var_values = array ( /* undefined/unset vars */ $unset_var, $undef_var, - + /* binary strings */ b"0", b'0', @@ -180,7 +180,7 @@ $var_values = array ( b"10string" ); -// test conversion to these types +// test conversion to these types $types = array( "boolean", "bool" @@ -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..9af1bfbaa8 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -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..5217121385 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -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..8431cb802f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -154,7 +154,7 @@ $var_values = array ( $unset_var, $undef_var ); - + /* test conversion to object type */ $type = "object"; @@ -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..e64dd08b80 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -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/head.phpt b/ext/standard/tests/general_functions/head.phpt index 059c56b258..e83bbf6aca 100644 --- a/ext/standard/tests/general_functions/head.phpt +++ b/ext/standard/tests/general_functions/head.phpt @@ -27,7 +27,7 @@ var_dump(headers_list()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- NULL bool(false) array(0) { 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 b97a945ee5..a90a6e83d2 100644 --- a/ext/standard/tests/general_functions/ini_get_all.phpt +++ b/ext/standard/tests/general_functions/ini_get_all.phpt @@ -4,7 +4,7 @@ ini_get_all() tests pcre.backtrack_limit=1000000 pcre.recursion_limit=100000 --SKIPIF-- -<?php if (!extension_loaded("reflection")) die("skip"); ?> +<?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_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt index e76d7083d4..bf88c7c920 100644 --- a/ext/standard/tests/general_functions/intval_variation1.phpt +++ b/ext/standard/tests/general_functions/intval_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test intval() function : usage variation +Test intval() function : usage variation --FILE-- <?php /* Prototype : int intval(mixed var [, int base]) - * Description: Get the integer value of a variable using the optional base for the conversion + * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing intval() : usage variation ***\n"; diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt index 0b38236373..b27ace4063 100644 --- a/ext/standard/tests/general_functions/intval_variation2.phpt +++ b/ext/standard/tests/general_functions/intval_variation2.phpt @@ -1,13 +1,13 @@ --TEST-- -Test intval() function : usage variation +Test intval() function : usage variation --SKIPIF-- <?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only"); --FILE-- <?php /* Prototype : int intval(mixed var [, int base]) - * Description: Get the integer value of a variable using the optional base for the conversion + * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing intval() : usage variation ***\n"; @@ -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_array.phpt b/ext/standard/tests/general_functions/is_array.phpt index 223b732904..469a8ec6cb 100644 --- a/ext/standard/tests/general_functions/is_array.phpt +++ b/ext/standard/tests/general_functions/is_array.phpt @@ -25,7 +25,7 @@ $arrays = array( array("string", "test"), array('string', 'test') ); -/* loop to check that is_array() recognizes different +/* loop to check that is_array() recognizes different type of arrays, expected output bool(true) */ $loop_counter = 1; foreach ($arrays as $var_array ) { @@ -39,14 +39,14 @@ echo "\n*** Testing is_array() on non array types ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// unset variables +// unset variables $unset_array = array(10); unset($unset_array); -// other types in a array +// other types in a array $varient_arrays = array ( /* integers */ - 543915, + 543915, -5322, 0x55F, -0xCCF, @@ -54,7 +54,7 @@ $varient_arrays = array ( -0654, /* strings */ - "", + "", '', "0", '0', @@ -68,20 +68,20 @@ $varient_arrays = array ( .5E+8, -.5e+90, 1e5, - + /* objects */ - new stdclass, - + new stdclass, + /* resources */ - $fp, - $dfp, + $fp, + $dfp, /* nulls */ - null, + null, NULL, /* boolean */ - true, + true, TRUE, FALSE, false, @@ -90,7 +90,7 @@ $varient_arrays = array ( @$unset_array, @$undefined_array ); -/* loop through the $varient_array to see working of +/* loop through the $varient_array to see working of is_array() on non array types, expected output bool(false) */ $loop_counter = 1; foreach ($varient_arrays as $type ) { @@ -102,9 +102,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_array() ); -//arguments more than expected +//arguments more than expected var_dump( is_array ($fp, $fp) ); - + echo "Done\n"; /* close resources */ fclose($fp); diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt index de1c0430ee..a8336524de 100644 --- a/ext/standard/tests/general_functions/is_bool.phpt +++ b/ext/standard/tests/general_functions/is_bool.phpt @@ -3,22 +3,22 @@ Test is_bool() function --FILE-- <?php /* Prototype: bool is_bool ( mixed $var ); - * Description: Finds whether the given variable is a boolean + * Description: Finds whether the given variable is a boolean */ echo "*** Testing is_bool() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bools = array( TRUE, FALSE, true, false, ); -/* loop to check that is_bool() recognizes different +/* loop to check that is_bool() recognizes different bool values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_bools as $bool_val ) { - echo "-- Iteration $loop_counter --\n"; $loop_counter++; + echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_bool($bool_val) ); } @@ -36,7 +36,7 @@ unset ($unset_bool1); unset ($unset_bool2); unset ($unset_var); -// other types in a array +// other types in a array $not_bool_types = array ( /* integers */ 0, @@ -98,7 +98,7 @@ $not_bool_types = array ( /* nulls */ null, NULL, - + /* arrays */ array(), array(0), @@ -114,16 +114,16 @@ $not_bool_types = array ( array(1 => "One", "two" => 2), /* unset bool vars and undefined var */ - @$unset_bool1, - @$unset_bool2, - @$unset_var, + @$unset_bool1, + @$unset_bool2, + @$unset_var, @$undefined_var ); -/* loop through the $not_bool_types to see working of +/* loop through the $not_bool_types to see working of is_bool() on non bull types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_bool_types as $type ) { - echo "-- Iteration $loop_counter --\n"; $loop_counter++; + echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_bool($type) ); } @@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_bool() ); -//arguments more than expected +//arguments more than expected var_dump( is_bool(TRUE, FALSE) ); - + echo "Done\n"; // close resources 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..06941832db 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 +Test is_callable() function : usage variations - on objects --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); @@ -11,7 +8,7 @@ error_reporting = E_ALL & ~E_NOTICE | E_STRICT */ /* Prototype: void check_iscallable_objects( $methods ); - Description: use is_callable() on given $method to check if the array + Description: use is_callable() on given $method to check if the array contains a valid method name; returns true if valid function name, false otherwise */ @@ -35,11 +32,11 @@ echo "\n*** Testing is_callable() on objects ***\n"; class object_class { public $value = 100; - + /* static method */ static public function foo() { } - + public function foo1() { } /* function name with mixed string and integer */ @@ -50,7 +47,7 @@ class object_class } /* function name having boolean value */ public function TRUE() { - } + } protected function foo2() { } @@ -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 ac23b8a939..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]] ); @@ -32,4 +29,4 @@ NULL Warning: is_callable() expects at most 3 parameters, 4 given in %s on line %d NULL -===DONE===
\ No newline at end of file +===DONE=== 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 1019bca6fa..5bfd4be321 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 +Test is_callable() function : usage variations - on invalid function names --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); @@ -151,4 +148,4 @@ Resource id #%d bool(false) bool(false) Resource id #%d -===DONE===
\ No newline at end of file +===DONE=== 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..6adf5414f8 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -7,11 +7,11 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype: bool is_float ( mixed $var ); - * Description: Finds whether the given variable is a float - */ + * Description: Finds whether the given variable is a float + */ 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 @@ -63,7 +63,7 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { var $array = array(10.5); @@ -72,7 +72,7 @@ $object = new foo(); $not_floats = array ( new foo, //object - $object, + $object, $fp, // resource $dfp, @@ -90,7 +90,7 @@ $not_floats = array ( TRUE, false, FALSE, - + "", // strings '', "0", @@ -103,7 +103,7 @@ $not_floats = array ( '1e5', '1.5e6_string', "1.5e6_string", - + 1, // integers, hex and octal -1, 0, @@ -112,11 +112,11 @@ $not_floats = array ( -0x673, 0123, -0123, - + @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_floats to see working of +/* loop through the $not_floats to see working of is_float(), is_double() & is_real() on objects, arrays, boolean and others */ $loop_counter = 1; @@ -133,14 +133,14 @@ var_dump( is_float() ); var_dump( is_double() ); var_dump( is_real() ); -//arguments more than expected +//arguments more than expected var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); - + echo "Done\n"; -// close the resources used +// close the resources used fclose($fp); closedir($dfp); diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt index 13ebb67a79..f5350f848e 100644 --- a/ext/standard/tests/general_functions/is_float_64bit.phpt +++ b/ext/standard/tests/general_functions/is_float_64bit.phpt @@ -9,11 +9,11 @@ precision=14 --FILE-- <?php /* Prototype: bool is_float ( mixed $var ); - * Description: Finds whether the given variable is a float - */ + * Description: Finds whether the given variable is a float + */ 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 @@ -65,7 +65,7 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { var $array = array(10.5); @@ -74,7 +74,7 @@ $object = new foo(); $not_floats = array ( new foo, //object - $object, + $object, $fp, // resource $dfp, @@ -92,7 +92,7 @@ $not_floats = array ( TRUE, false, FALSE, - + "", // strings '', "0", @@ -105,7 +105,7 @@ $not_floats = array ( '1e5', '1.5e6_string', "1.5e6_string", - + 1, // integers, hex and octal -1, 0, @@ -114,11 +114,11 @@ $not_floats = array ( -0x673, 0123, -0123, - + @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_floats to see working of +/* loop through the $not_floats to see working of is_float(), is_double() & is_real() on objects, arrays, boolean and others */ $loop_counter = 1; @@ -135,11 +135,11 @@ var_dump( is_float() ); var_dump( is_double() ); var_dump( is_real() ); -//arguments more than expected +//arguments more than expected var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 9867410e40..aa2306e763 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -7,17 +7,17 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype: bool is_int ( mixed $var ); - * Description: Finds whether the given variable is an integer + * Description: Finds whether the given variable is an integer */ 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, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -32,11 +32,11 @@ $valid_ints = array( -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); -/* loop to check that is_int() recognizes different +/* loop to check that is_int() recognizes different integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($int_val) ); var_dump( is_integer($int_val) ); var_dump( is_long($int_val) ); @@ -52,16 +52,16 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// other types in a array +// other types in a array $not_int_types = array ( /* float values */ -2147483649, // float value 2147483648, // float value -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int - 020000000001, // float value, beyond max positive int - -020000000001, // float value, beyond max negative int - 0.0, + 020000000001, // float value, beyond max positive int + -020000000001, // float value, beyond max negative int + 0.0, -0.1, 1.0, 1e5, @@ -70,14 +70,14 @@ $not_int_types = array ( -1E9, 10.0000000000000000005, 10.5e+5, - + /* objects */ new stdclass, /* resources */ $fp, $dfp, - + /* arrays */ array(), array(0), @@ -91,7 +91,7 @@ $not_int_types = array ( array(FALSE), array(1,2,3,4), array(1 => "One", "two" => 2), - + /* strings */ "", '', @@ -119,14 +119,14 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -138,11 +138,11 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; // close the resources diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index 228a11690d..ac98b09436 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -9,17 +9,17 @@ precision=14 --FILE-- <?php /* Prototype: bool is_int ( mixed $var ); - * Description: Finds whether the given variable is an integer + * Description: Finds whether the given variable is an integer */ 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, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -34,11 +34,11 @@ $valid_ints = array( -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); -/* loop to check that is_int() recognizes different +/* loop to check that is_int() recognizes different integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($int_val) ); var_dump( is_integer($int_val) ); var_dump( is_long($int_val) ); @@ -54,16 +54,16 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// other types in a array +// other types in a array $not_int_types = array ( /* float values */ -2147483649, // float value 2147483648, // float value -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int - 020000000001, // float value, beyond max positive int - -020000000001, // float value, beyond max negative int - 0.0, + 020000000001, // float value, beyond max positive int + -020000000001, // float value, beyond max negative int + 0.0, -0.1, 1.0, 1e5, @@ -72,14 +72,14 @@ $not_int_types = array ( -1E9, 10.0000000000000000005, 10.5e+5, - + /* objects */ new stdclass, /* resources */ $fp, $dfp, - + /* arrays */ array(), array(0), @@ -93,7 +93,7 @@ $not_int_types = array ( array(FALSE), array(1,2,3,4), array(1 => "One", "two" => 2), - + /* strings */ "", '', @@ -121,14 +121,14 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { - echo "--Iteration $loop_counter--\n"; $loop_counter++; + echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_int($type) ); var_dump( is_integer($type) ); var_dump( is_long($type) ); @@ -140,11 +140,11 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt index ad0435b7c8..e52b3d29f4 100644 --- a/ext/standard/tests/general_functions/is_null.phpt +++ b/ext/standard/tests/general_functions/is_null.phpt @@ -3,11 +3,11 @@ Test is_null() function --FILE-- <?php /* Prototype: bool is_null ( mixed $var ); - * Description: Finds whether the given variable is NULL + * Description: Finds whether the given variable is NULL */ 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; @@ -15,7 +15,7 @@ $unset_bool = true; $unset_object = new stdclass; $unset_resource = fopen(__FILE__, "r"); // unset them to make it null. -unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource); +unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource); $null_var1 = NULL; $null_var2 = null; @@ -32,7 +32,7 @@ $valid_nulls = array( @$unset_resource, @$undefined_var, ); -/* loop to check that is_null() recognizes different +/* loop to check that is_null() recognizes different null values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_nulls as $null_val ) { @@ -46,7 +46,7 @@ echo "\n*** Testing is_bool() on non null values ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// other types in a array +// other types in a array $not_null_types = array ( /* integers */ 0, @@ -119,7 +119,7 @@ $not_null_types = array ( array(1,2,3,4), array(1 => "One", "two" => 2), ); -/* loop through the $not_null_types to see working of +/* loop through the $not_null_types to see working of is_null() on non null types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_null_types as $type ) { @@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_null() ); -//arguments more than expected +//arguments more than expected var_dump( is_null(NULL, null) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt index 32fb8f3094..b529994ec1 100644 --- a/ext/standard/tests/general_functions/is_numeric.phpt +++ b/ext/standard/tests/general_functions/is_numeric.phpt @@ -3,11 +3,11 @@ Test is_numeric() function --FILE-- <?php /* Prototype: bool is_numeric ( mixed $var ); - * Description: Finds whether a variable is a number or a numeric string + * Description: Finds whether a variable is a number or a numeric string */ echo "*** Testing is_numeric() with valid numeric values ***\n"; -// different valid numeric vlaues +// different valid numeric values $numerics = array( 0, 1, @@ -58,15 +58,15 @@ $numerics = array( //0x1111111111111111111111, -0x1111111, +0x6698319, - 01000000000000000000000, + 01000000000000000000000, 0123, 0345, - -0200001, - -0200001.7, - 0200001.7, - +0200001, - +0200001.7, - +0200001.7, + -0200001, + -0200001.7, + 0200001.7, + +0200001, + +0200001.7, + +0200001.7, 2.00000000000000000000001, // a float value with more precision points "1", // numeric in the form of string "-1", @@ -87,7 +87,7 @@ $numerics = array( '-0123', '+0123' ); -/* loop to check that is_numeric() recognizes different +/* loop to check that is_numeric() recognizes different numeric values, expected output: bool(true) */ $loop_counter = 1; foreach ($numerics as $num ) { @@ -105,13 +105,13 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10.5; unset ($unset_var); -// other types in a array +// other types in a array $not_numerics = array( "0x80001", - "-0x80001", - "+0x80001", + "-0x80001", + "+0x80001", "-0x80001.5", - "0x80001.5", + "0x80001.5", new stdclass, // object $fp, // resource $dfp, @@ -126,7 +126,7 @@ $not_numerics = array( "20 test", "3.6test", "1,000", - "NULL", + "NULL", "true", true, NULL, @@ -137,7 +137,7 @@ $not_numerics = array( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_numerics to see working of +/* loop through the $not_numerics to see working of is_numeric() on non numeric values, expected output: bool(false) */ $loop_counter = 1; foreach ($not_numerics as $type ) { @@ -149,9 +149,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_numeric() ); -//arguments more than expected +//arguments more than expected var_dump( is_numeric("10", "20") ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt index 8abc766376..89b5081fae 100644 --- a/ext/standard/tests/general_functions/is_object.phpt +++ b/ext/standard/tests/general_functions/is_object.phpt @@ -3,7 +3,7 @@ Test is_object() function --FILE-- <?php /* Prototype: bool is_object ( mixed $var ); - * Description: Finds whether the given variable is an object + * Description: Finds whether the given variable is an object */ echo "*** Testing is_object() with valid objects ***\n"; @@ -11,7 +11,7 @@ echo "*** Testing is_object() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -31,10 +31,10 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface IValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } @@ -42,18 +42,18 @@ interface IValue class Value implements IValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_dump ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,9 +88,9 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object -); - -/* loop to check that is_object() recognizes different +); + +/* loop to check that is_object() recognizes different objects, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_objects as $object ) { @@ -104,11 +104,11 @@ echo "\n*** Testing is_object() on non object types ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// unset object +// unset object $unset_object = new foo(); unset ($unset_object); -// other types in a array +// other types in a array $not_objects = array ( 0, -1, @@ -130,7 +130,7 @@ $not_objects = array ( @$unset_object, // unset object @$undefined_var, // undefined variable ); -/* loop through the $not_objects to see working of +/* loop through the $not_objects to see working of is_object() on non object types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_objects as $type ) { @@ -142,9 +142,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_object() ); -//arguments more than expected +//arguments more than expected var_dump( is_object($myClass_object, $myClass_object) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt index 75f4e4a8d8..27583d3d87 100644 --- a/ext/standard/tests/general_functions/is_resource_basic.phpt +++ b/ext/standard/tests/general_functions/is_resource_basic.phpt @@ -1,18 +1,18 @@ --TEST-- -Test is_resource() function : basic functionality +Test is_resource() function : basic functionality --FILE-- <?php /* Prototype : bool is_resource ( mixed $var ) * Description: Finds whether a variable is a resource * Source code: ext/standard/type.c - */ + */ echo "*** Testing is_resource() : basic functionality ***\n"; class Hello { public function SayHello($arg) { echo "Hello\n"; - } + } } @@ -25,7 +25,7 @@ $vars = array( array(1,2,3,4,5), NULL, new Hello()); - + $types = array( "bool=false", "bool=true", @@ -34,7 +34,7 @@ $types = array( "string", "array", "NULL", - "object"); + "object"); echo "\nNon-resource type cases\n"; @@ -44,7 +44,7 @@ for ($i=0; $i < count($vars); $i++) { } else { echo $types[$i]. " test returns FALSE\n"; } -} +} $res = fopen(__FILE__, "r"); echo "\nResource type..var_dump after file open returns\n"; @@ -64,7 +64,7 @@ if (is_resource($res)) { echo " TRUE\n"; } else { echo " FALSE\n"; -} +} ?> diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt index f7168737cd..acb3cb660b 100644 --- a/ext/standard/tests/general_functions/is_resource_error.phpt +++ b/ext/standard/tests/general_functions/is_resource_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_resource() function : error conditions +Test is_resource() function : error conditions --FILE-- <?php /* Prototype : bool is_resource ( mixed $var ) diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt index 53620178c4..d3e2fa572b 100644 --- a/ext/standard/tests/general_functions/is_scalar.phpt +++ b/ext/standard/tests/general_functions/is_scalar.phpt @@ -13,7 +13,7 @@ $scalar_variables = array( -45678, 0x5FF, // hexadecimal as integer 0X566, - -0xAAF, + -0xAAF, -0XCCF, 01234, // octal as integer -0126, @@ -33,8 +33,8 @@ $scalar_variables = array( " ", ' ', "string", - 'string', - "0", // numeric as string + 'string', + "0", // numeric as string "40", "50.696", "0x534", @@ -45,7 +45,7 @@ $scalar_variables = array( true, false ); -/* loop through each valid scalar variables in $scalar_variables +/* loop through each valid scalar variables in $scalar_variables and see the working of is_scalar(), expected output: bool(true) */ $loop_counter = 1; @@ -65,7 +65,7 @@ $array = array(10); $resource = opendir('.'); unset($int_var, $float_var, $string_var, $boolean_var, $object, $array, $resource); -// resources +// resources $fp = fopen(__FILE__, "r"); $dfp = opendir("."); @@ -73,7 +73,7 @@ $variation_array = array( NULL, null, - array(), // arrays + array(), // arrays array(NULL), array(true), array(0), @@ -94,9 +94,9 @@ $variation_array = array( @$resource, @$undefined_var // undefined variable -); +); -/* loop through each element of $variation_array to see the +/* loop through each element of $variation_array to see the working of is_scalar on non-scalar values, expected output: bool(false) */ $loop_counter = 1; @@ -113,7 +113,7 @@ var_dump( is_scalar() ); var_dump( is_scalar( $scalar_variables[2], $scalar_variables[2]) ); var_dump( is_scalar( new stdclass, new stdclass) ); -echo "Done\n"; +echo "Done\n"; // close the resources used fclose($fp); diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt index 72a885a57a..b8c82b187b 100644 --- a/ext/standard/tests/general_functions/is_string.phpt +++ b/ext/standard/tests/general_functions/is_string.phpt @@ -7,7 +7,7 @@ Test is_string() function */ echo "*** Testing is_string() with valid string values ***\n"; -// different valid strings +// different valid strings /* string created using Heredoc (<<<) */ $heredoc_string = <<<EOT @@ -50,7 +50,7 @@ $strings = array( $heredoc_empty_string, $heredoc_null_string ); -/* loop to check that is_string() recognizes different +/* loop to check that is_string() recognizes different strings, expected output bool(true) */ $loop_counter = 1; foreach ($strings as $string ) { @@ -70,10 +70,10 @@ $unset_string2 = 'string'; $unset_heredoc = <<<EOT this is heredoc string EOT; -// unset the vars +// unset the vars unset($unset_string1, $unset_string2, $unset_heredoc); -// other types in a array +// other types in a array $not_strings = array ( /* integers */ 0, @@ -130,9 +130,9 @@ $not_strings = array ( @$unset_string1, @$unset_string2, @$unset_heredoc, - @$undefined_var + @$undefined_var ); -/* loop through the $not_strings to see working of +/* loop through the $not_strings to see working of is_string() on non string types, expected output bool(false) */ $loop_counter = 1; foreach ($not_strings as $type ) { @@ -144,9 +144,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_string() ); -//arguments more than expected +//arguments more than expected var_dump( is_string("string", "test") ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt index fd3f5be6a0..4c03210342 100644 --- a/ext/standard/tests/general_functions/isset_basic1.phpt +++ b/ext/standard/tests/general_functions/isset_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -Test isset() function : basic functionality +Test isset() function : basic functionality --FILE-- <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) * Description: Determine if a variable is set and is not NULL - */ + */ class foo {} diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt index 5f0432b594..9137aeb922 100644 --- a/ext/standard/tests/general_functions/isset_basic2.phpt +++ b/ext/standard/tests/general_functions/isset_basic2.phpt @@ -1,10 +1,10 @@ --TEST-- -Test isset() function : basic functionality +Test isset() function : basic functionality --FILE-- <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) * Description: Determine if a variable is set and is not NULL - */ + */ class foo {} @@ -28,14 +28,14 @@ var_dump(isset($i, $f, $s, $b)); echo "\n\nArray test:\n"; $arr = array(); -var_dump(isset($var)); +var_dump(isset($var)); var_dump(isset($var[1])); -var_dump(isset($var, $var[1])); +var_dump(isset($var, $var[1])); echo "..now set\n"; $var[1] = 10; -var_dump(isset($var)); -var_dump(isset($var[1])); -var_dump(isset($var, $var[1])); +var_dump(isset($var)); +var_dump(isset($var[1])); +var_dump(isset($var, $var[1])); ?> ===DONE=== diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt index 1c62340970..dbda1d9e66 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt @@ -1,13 +1,13 @@ --TEST-- -Test ob_get_flush() function : basic functionality +Test ob_get_flush() function : basic functionality --INI-- output_buffering=0 --FILE-- <?php /* Prototype : bool ob_get_flush(void) - * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer + * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_flush() : basic functionality ***\n"; diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index 0664043eba..1d3538120d 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test ob_get_flush() function : error conditions +Test ob_get_flush() function : error conditions --INI-- output_buffering=0 --FILE-- <?php /* Prototype : bool ob_get_flush(void) - * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer + * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ob_get_flush() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt index b3470bec55..9b3e8fb465 100644 --- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt @@ -1,13 +1,13 @@ --TEST-- -Test ob_get_length() function : basic functionality +Test ob_get_length() function : basic functionality --INI-- output_buffering=0 --FILE-- <?php /* Prototype : int ob_get_length(void) - * Description: Return the length of the output buffer + * Description: Return the length of the output buffer * Source code: main/output.c - * Alias to functions: + * Alias to functions: */ function dump_string_length( $string ) diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt index 023b311fe3..f5a18c457e 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..530e186a99 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_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index ebc714455d..fb12c3f139 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -120,7 +120,7 @@ var_dump(parse_ini_file($filename, true)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_file() expects at least 1 parameter, 0 given in %sparse_ini_file.php on line 6 bool(false) 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..e5e402b8fc 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -4,7 +4,7 @@ Test parse_ini_string() function <?php /* Prototype: array parse_ini_string(string $string [,bool $process_sections]); Description: parse_ini_string() loads in the ini file specified in filename, - and returns the settings in it in an associative array. + and returns the settings in it in an associative array. */ $parse_string = <<<EOD @@ -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_002.phpt b/ext/standard/tests/general_functions/parse_ini_string_002.phpt index 106cd0c842..98c9c0b359 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_002.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_002.phpt @@ -86,7 +86,7 @@ var_dump(parse_ini_string($ini, true)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: parse_ini_string() expects at least 1 parameter, 0 given in %s bool(false) 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/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt index 2f671cd016..ca4c3d4022 100644 --- a/ext/standard/tests/general_functions/php_uname_error.phpt +++ b/ext/standard/tests/general_functions/php_uname_error.phpt @@ -13,7 +13,7 @@ var_dump( php_uname('a', true) ); echo "\n-- Testing php_uname() function with invalid mode --\n"; // am invalid mode should result in same o/p as mode 'a' -var_dump( php_uname('z') == php_uname('z') ); +var_dump( php_uname('z') == php_uname('z') ); class barClass { } diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt index 4a47827657..d94fd80049 100644 --- a/ext/standard/tests/general_functions/php_uname_variation1.phpt +++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt @@ -26,34 +26,34 @@ $values = array( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "new fooClass()" => new fooClass(), - + // undefined data "undefined var" => $undefined_var, - + // unset data "unset var" => $unset_var, ); 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..5069dd33f1 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-- @@ -28,9 +24,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -46,7 +42,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -84,7 +80,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -116,7 +112,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -231,7 +227,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -259,9 +255,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 25776dd3ba..3054e0a431 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -29,9 +29,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -47,7 +47,7 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); +); /* calling check_printr() to display contents of integer variables using print_r() */ check_printr($integers); @@ -85,7 +85,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -117,7 +117,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_printr() to display boolean variables using print_r() */ check_printr($booleans); var_dump( reset($booleans) ); @@ -232,7 +232,7 @@ print_r($recursion_obj2); echo "\n*** Testing print_r() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -260,9 +260,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); 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..539eea202e 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -45,7 +45,7 @@ function get_priority_from_wmic() { $f = false; $m = [ - strpos($t[0], ' ProcessId' ), + strpos($t[0], ' ProcessId' ), strpos($t[0], ' Priority ') ]; @@ -71,10 +71,10 @@ function get_priority_from_wmic() { $p = [ /* '<verbose name>' => ['<wmic value>', '<proc_nice value>'] */ - 'Idle' => [4, 10], - 'Below normal' => [6, 5], - 'Normal' => [8, 0], - 'Above normal' => [10, -5], + 'Idle' => [4, 10], + 'Below normal' => [6, 5], + 'Normal' => [8, 0], + 'Above normal' => [10, -5], 'High priority' => [13, -10] ]; @@ -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_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt index f3335bc8ce..dc104283eb 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes1.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes1.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with > 16 pipes +proc_open() with > 16 pipes --FILE-- <?php diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index 29eca464e1..bc8f29b6fe 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with no pipes +proc_open() with no pipes --FILE-- <?php @@ -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/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt index d64987018b..6e90471bdc 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with invalid pipes +proc_open() with invalid pipes --FILE-- <?php diff --git a/ext/standard/tests/general_functions/putenv.phpt b/ext/standard/tests/general_functions/putenv.phpt index ab2c1b41f7..254207320b 100644 --- a/ext/standard/tests/general_functions/putenv.phpt +++ b/ext/standard/tests/general_functions/putenv.phpt @@ -20,7 +20,7 @@ var_dump(putenv("")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) bool(true) string(5) "value" 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..08ac2f1d01 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..76c6db5468 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..93faf3ac16 100644 --- a/ext/standard/tests/general_functions/rand.phpt +++ b/ext/standard/tests/general_functions/rand.phpt @@ -29,7 +29,7 @@ var_dump(mt_getrandmax(1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(%d) Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d @@ -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..ac0b1d7db2 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sleep() function : basic functionality +Test sleep() function : basic functionality --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); @@ -7,22 +7,22 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php /* Prototype : int sleep ( int $seconds ) - * Description: Delays the program execution for the given number of seconds . + * Description: Delays the program execution for the given number of seconds . * Source code: ext/standard/basic_functions.c */ echo "*** Testing sleep() : basic functionality ***\n"; -$sleeptime = 5; // sleep for 5 seconds +$sleeptime = 1; // sleep for 1 seconds -set_time_limit(20); +set_time_limit(20); $time_start = microtime(true); // Sleep for a while sleep($sleeptime); -// Test passes if sleeps for at least 98% of specified time +// Test passes if sleeps for at least 98% of specified time $sleeplow = $sleeptime - ($sleeptime * 2 /100); $time_end = microtime(true); diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt index c4f069a3d2..199bd8e9bc 100644 --- a/ext/standard/tests/general_functions/sleep_error.phpt +++ b/ext/standard/tests/general_functions/sleep_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test sleep() function : error conditions +Test sleep() function : error conditions --FILE-- <?php /* Prototype : int sleep ( int $seconds ) - * Description: Delays the program execution for the given number of seconds . + * Description: Delays the program execution for the given number of seconds . * Source code: ext/standard/basic_functions.c */ set_time_limit(20); - + echo "*** Testing sleep() : error conditions ***\n"; echo "\n-- Testing sleep() function with zero arguments --\n"; diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index b2c5cd8b76..ee5313aaae 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -21,27 +21,27 @@ EOD; /* null heredoc string */ $heredoc_empty_string = <<<EOD EOD; -/* heredoc string with NULL */ +/* heredoc string with NULL */ $heredoc_NULL_string = <<<EOD NULL EOD; -// different valid scalar vlaues +// different valid scalar values $scalars = array( /* integers */ 0, 1, -1, -2147483648, // max negative integer value - -2147483647, + -2147483647, 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal 0x12ab, 0Xfff, 0XFA, - - /* floats */ + + /* floats */ -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal @@ -66,12 +66,12 @@ $scalars = array( .0034E-30, /* booleans */ - true, + true, TRUE, FALSE, - false, + false, - /* strings */ + /* strings */ "", '', " ", @@ -91,12 +91,12 @@ $scalars = array( "true", /*"\0123", "\0x12FF",*/ - $heredoc_string, + $heredoc_string, $heredoc_numeric_string, $heredoc_empty_string ); -/* loop to check that strval() recognizes different - scalar values and retuns the string conversion of same */ +/* loop to check that strval() recognizes different + scalar values and returns the string conversion of same */ $loop_counter = 1; foreach ($scalars as $scalar ) { echo "-- Iteration $loop_counter --\n"; $loop_counter++; @@ -112,7 +112,7 @@ $dfp = opendir( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { function __toString() { @@ -133,7 +133,7 @@ $not_scalars = array ( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_scalars to see working of +/* loop through the $not_scalars to see working of strval() on objects, arrays, boolean and others */ $loop_counter = 1; foreach ($not_scalars as $value ) { @@ -145,9 +145,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( strval() ); -//arguments more than expected +//arguments more than expected var_dump( strval( $scalars[0], $scalars[1]) ); - + echo "Done\n"; // close the resources used diff --git a/ext/standard/tests/general_functions/type.phpt b/ext/standard/tests/general_functions/type.phpt index 90bfb45f28..ac29a1bf38 100644 --- a/ext/standard/tests/general_functions/type.phpt +++ b/ext/standard/tests/general_functions/type.phpt @@ -54,7 +54,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(5) "array" string(6) "string" string(5) "array" diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt index 285365ab60..2da832b8ed 100644 --- a/ext/standard/tests/general_functions/uniqid_basic.phpt +++ b/ext/standard/tests/general_functions/uniqid_basic.phpt @@ -3,7 +3,7 @@ Test uniqid() function : basic functionality --FILE-- <?php /* Prototype : string uniqid ([ string $prefix= "" [, bool $more_entropy= false ]] ) - * Description: Gets a prefixed unique identifier based on the current time in microseconds. + * Description: Gets a prefixed unique identifier based on the current time in microseconds. * Source code: ext/standard/uniqid.c */ echo "*** Testing uniqid() : basic functionality ***\n"; @@ -16,26 +16,26 @@ echo "\n\n"; echo "uniqid() with a prefix\n"; -// Use a fixed prefix so we can ensure length of o/p id is fixed +// Use a fixed prefix so we can ensure length of o/p id is fixed $prefix = array ( 99999, "99999", 10.5e2, null, true, - false + false ); -for ($i = 0; $i < count($prefix); $i++) { +for ($i = 0; $i < count($prefix); $i++) { var_dump(uniqid($prefix[$i])); var_dump(uniqid($prefix[$i], true)); var_dump(uniqid($prefix[$i], false)); echo "\n"; -} +} ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : basic functionality *** uniqid() without a prefix diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt index 388bc42599..8f7f22d7d3 100644 --- a/ext/standard/tests/general_functions/uniqid_error.phpt +++ b/ext/standard/tests/general_functions/uniqid_error.phpt @@ -3,7 +3,7 @@ Test uniqid() function : error conditions --FILE-- <?php /* Prototype : string uniqid ([ string $prefix= "" [, bool $more_entropy= false ]] ) - * Description: Gets a prefixed unique identifier based on the current time in microseconds. + * Description: Gets a prefixed unique identifier based on the current time in microseconds. * Source code: ext/standard/uniqid.c */ echo "*** Testing uniqid() : error conditions ***\n"; @@ -17,7 +17,7 @@ var_dump(uniqid($prefix, $more_entropy, $extra_arg)); echo "\n-- Testing uniqid() function with invalid values for \$prefix --\n"; class class1{} $obj = new class1(); -$res = fopen(__FILE__, "r"); +$res = fopen(__FILE__, "r"); $array = array(1,2,3); uniqid($array, false); @@ -28,7 +28,7 @@ fclose($res); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing uniqid() : error conditions *** -- Testing uniqid() function with more than expected no. of arguments -- diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index 8c724d79ee..bec1dfa1d7 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -7,16 +7,16 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php /* Prototype : void usleep ( int $micro_seconds ) - * Description: Delays program execution for the given number of micro seconds. + * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ - + set_time_limit(20); - + echo "*** Testing usleep() : basic functionality ***\n"; -$sleeptime = 5000000; // == 5 seconds -// Test passes if sleeps for at least 98% of specified time +$sleeptime = 1000000; // == 1 seconds +// Test passes if sleeps for at least 98% of specified time $sleeplow = $sleeptime - ($sleeptime * 2 /100); $time_start = microtime(true); diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt index 474aab7d5d..bdd120cde9 100644 --- a/ext/standard/tests/general_functions/usleep_error.phpt +++ b/ext/standard/tests/general_functions/usleep_error.phpt @@ -1,13 +1,13 @@ --TEST-- -Test usleep() function : error conditions +Test usleep() function : error conditions --FILE-- <?php /* Prototype : void usleep ( int $micro_seconds ) - * Description: Delays program execution for the given number of micro seconds. + * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ - -set_time_limit(20); + +set_time_limit(20); echo "*** Testing usleep() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index b12f5f579f..78c862b77d 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -22,9 +22,9 @@ function check_vardump( $variables ) { $counter++; } } - + echo "\n*** Testing var_dump() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -40,8 +40,8 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); -/* calling check_vardump() to display contents of integer variables +); +/* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -78,9 +78,9 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); -/* calling check_vardump() to display contents of float variables +/* calling check_vardump() to display contents of float variables using var_dump() */ check_vardump($floats); @@ -101,7 +101,7 @@ $strings = array ( "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL "1234\t\n5678\n\t9100\rabcda" // strings with escape characters ); -/* calling check_vardump() to display contents of strings +/* calling check_vardump() to display contents of strings using var_dump() */ check_vardump($strings); @@ -111,7 +111,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_vardump() to display boolean variables using var_dump() */ check_vardump($booleans); @@ -226,7 +226,7 @@ var_dump($recursion_obj2); echo "\n*** Testing var_dump() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -254,7 +254,7 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); /* calling check_vardump() to display combinations of scalar and non-scalar variables using var_dump() */ @@ -271,7 +271,7 @@ $misc_values = array ( check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; -var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, +var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, $objects, $misc_values, $variations ); /* checking var_dump() on functions */ @@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump(); /* closing resource handle used */ -closedir($dir_handle); +closedir($dir_handle); echo "Done\n"; ?> diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index a7f61ec063..3b8212204a 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -22,9 +22,9 @@ function check_vardump( $variables ) { $counter++; } } - + echo "\n*** Testing var_dump() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -40,8 +40,8 @@ $integers = array ( -0x80000000, // min range of hexadecimal integer 017777777777, // max posotive octal integer -020000000000 // min range of octal integer -); -/* calling check_vardump() to display contents of integer variables +); +/* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -78,9 +78,9 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); -/* calling check_vardump() to display contents of float variables +/* calling check_vardump() to display contents of float variables using var_dump() */ check_vardump($floats); @@ -101,7 +101,7 @@ $strings = array ( "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL "1234\t\n5678\n\t9100\rabcda" // strings with escape characters ); -/* calling check_vardump() to display contents of strings +/* calling check_vardump() to display contents of strings using var_dump() */ check_vardump($strings); @@ -111,7 +111,7 @@ $booleans = array ( FALSE, true, false -); +); /* calling check_vardump() to display boolean variables using var_dump() */ check_vardump($booleans); @@ -226,7 +226,7 @@ var_dump($recursion_obj2); echo "\n*** Testing var_dump() on resources ***\n"; /* file type resource */ -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); /* directory type resource */ $dir_handle = opendir( dirname(__FILE__) ); @@ -254,7 +254,7 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); /* calling check_vardump() to display combinations of scalar and non-scalar variables using var_dump() */ @@ -271,7 +271,7 @@ $misc_values = array ( check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; -var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, +var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, $objects, $misc_values, $variations ); /* checking var_dump() on functions */ @@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump(); /* closing resource handle used */ -closedir($dir_handle); +closedir($dir_handle); echo "Done\n"; ?> diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index 7503e789b0..e440238970 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -17,13 +17,13 @@ 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', '-1', '-2147483648', // max negative integer value - '-2147483647', + '-2147483647', 2147483647, // max positive integer value 2147483640, 0x123B, // integer as hexadecimal @@ -53,11 +53,11 @@ $counter++; } echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bool = array( 1, TRUE, - true, + true, 0, FALSE, false @@ -77,7 +77,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 @@ -115,7 +115,7 @@ $counter++; } echo "*** Testing var_export() with valid strings ***\n"; -// different valid string +// different valid string $valid_strings = array( "", " ", @@ -148,7 +148,7 @@ $counter++; } echo "*** Testing var_export() with valid arrays ***\n"; -// different valid arrays +// different valid arrays $valid_arrays = array( array(), array(NULL), @@ -185,7 +185,7 @@ echo "*** Testing var_export() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -204,28 +204,28 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface iValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } // implement the interface class Value implements iValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -239,7 +239,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -260,7 +260,7 @@ $valid_objects = array( $foo_object, $Value_object, $concreteClass_object - ); + ); $counter = 1; /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; @@ -274,9 +274,9 @@ var_dump( var_export( $obj, TRUE) ); echo "\n"; $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; @@ -304,9 +304,9 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_export( var_export() ); -//arguments more than expected +//arguments more than expected var_export( var_export(TRUE, FALSE, TRUE) ); - + echo "\n\nDone"; @@ -914,12 +914,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 2dfd28785b..5f5f09bb2d 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -3,19 +3,19 @@ Test var_export() function with integer values --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with integer values ***\n"; -// different integer vlaues +// different integer values $valid_ints = array( '0' => '0', '1' => '1', '-1' => '-1', '-2147483648' => '-2147483648', // max negative integer value - '-2147483647' => '-2147483647', + '-2147483647' => '-2147483647', '2147483647' => 2147483647, // max positive integer value '2147483640' => 2147483640, '0x123B' => 0x123B, // integer as hexadecimal diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 01734b54de..d1c731fd3f 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -4,22 +4,22 @@ Test var_export() function with valid boolean values <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bool = array( "1" => 1, "TRUE" => TRUE, - "true" => true, + "true" => true, "0" => 0, "FALSE" => FALSE, "false" => false ); - + /* Loop to check for above boolean values with var_export() */ echo "\n*** Output for boolean values ***\n"; foreach($valid_bool as $key => $bool_value) { diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index c85a4782ae..d02065a7f6 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -5,13 +5,13 @@ serialize_precision=17 --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ 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_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index cfdac8b268..4668ace1c5 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid strings --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid strings ***\n"; -// different valid string +// different valid string $valid_strings = array( "\"\"" => "", "\" \"" => " ", diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt index ab81fa802e..dacb355323 100644 --- a/ext/standard/tests/general_functions/var_export_basic5.phpt +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt @@ -5,14 +5,14 @@ serialize_precision=17 --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid arrays ***\n"; -// different valid arrays +// different valid arrays $valid_arrays = array( "array()" => array(), "array(NULL)" => array(NULL), diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index ea3707d0bc..bdcdf48c02 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -3,9 +3,9 @@ Test var_export() function with valid objects --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() with valid objects ***\n"; @@ -13,7 +13,7 @@ echo "*** Testing var_export() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -32,28 +32,28 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface iValue { - public function setVal ($name, $val); + public function setVal ($name, $val); public function dumpVal (); } // implement the interface class Value implements iValue { private $vars = array (); - + public function setVal ( $name, $val ) { $this->vars[$name] = $val; } - + public function dumpVal () { var_export ( $vars ); } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -67,7 +67,7 @@ class myClass $this->public_var1 = new foo(); $this->private_var = new foo(); $this->proected_var = new foo(); - } + } } // create a object of each class defined above @@ -88,7 +88,7 @@ $valid_objects = array( "foo_object" => $foo_object, "Value_object" => $Value_object, "concreteClass_object" => $concreteClass_object - ); + ); /* Loop to check for above objects with var_export() */ echo "\n*** Output for objects ***\n"; foreach($valid_objects as $key => $obj) { @@ -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..525c55470d 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid null values --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ 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..faae2bca17 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -3,18 +3,18 @@ var_export(): simple test with arrays and objects --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ - + echo "\n\n-- Var export on a simple object --\n"; $o1 = new stdclass; $o1->p = '22'; $o2 = new stdclass; $o2->a = 1; -$o2->b = array('k'=>2); -$o2->x = $o1; +$o2->b = array('k'=>2); +$o2->x = $o1; var_export($o2); echo "\n\n-- Var export on an simple array --\n"; @@ -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/general_functions/var_export_error1.phpt b/ext/standard/tests/general_functions/var_export_error1.phpt index ffa542c053..d9c5eee9dc 100644 --- a/ext/standard/tests/general_functions/var_export_error1.phpt +++ b/ext/standard/tests/general_functions/var_export_error1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test var_export() function : error conditions +Test var_export() function : error conditions --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing var_export() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 57764e54d1..a6403e610d 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -3,9 +3,9 @@ Test var_export() function : error conditions - recursive object --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ @$obj->p =& $obj; diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index a5acb37027..c862691e91 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -3,9 +3,9 @@ Test var_export() function : error conditions - recursive array --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $a[] =& $a; 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/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 7cdb6e3d41..29c6a46f17 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -26,7 +26,7 @@ function do_test() { $context = stream_context_create(array('http'=>array('timeout'=>1))); file_get_contents('http://127.0.0.1:12342/', 0, $context); unset($context); - + $b = $a; $a = count(get_resources()); } diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt index 1ee194681f..d9f2a2b531 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 66cbc50ae1..63ae334066 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : basic functionality --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ @@ -16,13 +16,13 @@ $imagetype_filenames = array( //PNG file "PNG image file" => "200x100.png", - + //SWF file "SWF image file" => "200x100.swf", - + //BMP file "BMP image file" => "200x100.bmp", - + //TIFF intel byte order "TIFF intel byte order image file" => "200x100.tif", @@ -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_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt index d72535c91c..947379d145 100644 --- a/ext/standard/tests/image/getimagesize_error1.phpt +++ b/ext/standard/tests/image/getimagesize_error1.phpt @@ -3,9 +3,9 @@ Test getimagesize() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : error conditions ***\n"; diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index f75f3826c5..766427b59f 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -1,17 +1,11 @@ --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]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ /* @@ -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 6f9eddcf57..8cac17b3e7 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -1,17 +1,11 @@ --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]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : tiff_mm format ***\n"; diff --git a/ext/standard/tests/image/getimagesize_variation1.phpt b/ext/standard/tests/image/getimagesize_variation1.phpt index 09679f53c7..78795f7636 100644 --- a/ext/standard/tests/image/getimagesize_variation1.phpt +++ b/ext/standard/tests/image/getimagesize_variation1.phpt @@ -3,9 +3,9 @@ Test getimagesize() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 5bfbcfd406..3efdd51b40 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -1,17 +1,11 @@ --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]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index 26d871150b..9db2b5eadb 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 111e5c8730..8c37da7665 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : variation - For shockwave-flash format --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ @@ -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_003.phpt b/ext/standard/tests/image/getimagesize_variation_003.phpt index e46b9e97b4..1de9850651 100644 --- a/ext/standard/tests/image/getimagesize_variation_003.phpt +++ b/ext/standard/tests/image/getimagesize_variation_003.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index 47189ccae0..f5f2b83da2 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : basic functionality for shockwave-flash --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ @@ -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..ce2179293c 100644 --- a/ext/standard/tests/image/getimagesize_wbmp.phpt +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt @@ -1,17 +1,11 @@ --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]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : wbmp format ***\n"; diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt index 2a1aeb637f..9156d40b10 100644 --- a/ext/standard/tests/image/getimagesize_xbm.phpt +++ b/ext/standard/tests/image/getimagesize_xbm.phpt @@ -1,17 +1,11 @@ --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]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing getimagesize() : xbm format ***\n"; diff --git a/ext/standard/tests/image/getimagesizefromstring1.phpt b/ext/standard/tests/image/getimagesizefromstring1.phpt index 1e9dc59d45..df75be518b 100644 --- a/ext/standard/tests/image/getimagesizefromstring1.phpt +++ b/ext/standard/tests/image/getimagesizefromstring1.phpt @@ -5,9 +5,9 @@ Compare getimagesize and getimagesizefromstring $img = __DIR__ . '/test.gif'; $i1 = getimagesize($img); - + $data = file_get_contents($img); - + $i2 = getimagesizefromstring($data); var_dump($i1); diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt index 98a92a6c40..a2e2758188 100644 --- a/ext/standard/tests/image/image_type_to_extension.phpt +++ b/ext/standard/tests/image/image_type_to_extension.phpt @@ -1,8 +1,7 @@ --TEST-- image_type_to_extension() --SKIPIF-- -<?php - if (!function_exists('image_type_to_extension')) die('skip image_type_to_extension() not available'); +<?php 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..8e3176ef41 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,36 +1,32 @@ --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 /* Prototype : string image_type_to_mime_type ( int $imagetype ) * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype. * Source code: ext/standard/image.c - * Alias to functions: + * Alias to functions: */ echo "Starting image_type_to_mime_type() test\n\n"; $image_types = array ( - IMAGETYPE_GIF, - IMAGETYPE_JPEG, - IMAGETYPE_PNG, - IMAGETYPE_SWF, - IMAGETYPE_PSD, - IMAGETYPE_BMP, - IMAGETYPE_TIFF_II, - IMAGETYPE_TIFF_MM, - IMAGETYPE_JPC, - IMAGETYPE_JP2, - IMAGETYPE_JPX, - IMAGETYPE_JB2, - IMAGETYPE_IFF, - IMAGETYPE_WBMP, - IMAGETYPE_JPEG2000, + IMAGETYPE_GIF, + IMAGETYPE_JPEG, + IMAGETYPE_PNG, + IMAGETYPE_SWF, + IMAGETYPE_PSD, + IMAGETYPE_BMP, + IMAGETYPE_TIFF_II, + IMAGETYPE_TIFF_MM, + IMAGETYPE_JPC, + IMAGETYPE_JP2, + IMAGETYPE_JPX, + IMAGETYPE_JB2, + IMAGETYPE_IFF, + IMAGETYPE_WBMP, + IMAGETYPE_JPEG2000, IMAGETYPE_XBM, IMAGETYPE_WEBP ); @@ -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_error.phpt b/ext/standard/tests/image/image_type_to_mime_type_error.phpt index 9a3e2d17c5..88aacbf176 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_error.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_error.phpt @@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : error conditions - Pass incorrect num --FILE-- <?php /* Prototype : proto string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ 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..2c67338e41 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 @@ -5,7 +5,7 @@ Test image_type_to_mime_type() function : usage variations - Pass different dat --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ @@ -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_variation2.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt index 6043c81180..141bc576ff 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt @@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : usage variations - Pass decimal, octa --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ @@ -16,13 +16,13 @@ $values = array ( 1, 12345, -12345, - + //Octal values 02, 010, 030071, -030071, - + //Hexadecimal values 0x0, 0x1, 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..1b4f418cdb 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 @@ -5,7 +5,7 @@ Sanjay Mantoor <sanjay.mantoor@gmail.com> --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ @@ -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..0a96338736 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,14 +2,14 @@ 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-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ 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/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/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt index f0a5d5ea85..db1f449cb6 100644 --- a/ext/standard/tests/mail/bug66535.phpt +++ b/ext/standard/tests/mail/bug66535.phpt @@ -11,9 +11,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : send email without additional headers ***\n"; diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt index f81d32403e..bc485de678 100644 --- a/ext/standard/tests/mail/bug69115.phpt +++ b/ext/standard/tests/mail/bug69115.phpt @@ -7,7 +7,7 @@ if( substr(PHP_OS, 0, 3) != 'WIN' ) { } ?> --INI-- -SMTP = +SMTP = smtp_port = --FILE-- <?php 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/bug73203.phpt b/ext/standard/tests/mail/bug73203.phpt index c3f22d36d5..79615f31b5 100644 --- a/ext/standard/tests/mail/bug73203.phpt +++ b/ext/standard/tests/mail/bug73203.phpt @@ -9,7 +9,7 @@ verify that the call succeeds. sendmail_path=cat >/dev/null mail.add_x_header = Off --SKIPIF-- -<?php +<?php if (substr(PHP_OS, 0, 3) === 'WIN') die('skip won\'t run on Windows'); ?> --FILE-- 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/ezmlm_hash_basic_64bit.phpt b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt index 44a06651ad..46abdba7c8 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ezmlm_hash() function : basic functionality +Test ezmlm_hash() function : basic functionality --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); diff --git a/ext/standard/tests/mail/ezmlm_hash_error.phpt b/ext/standard/tests/mail/ezmlm_hash_error.phpt index f5bc578558..c5f49dd73a 100644 --- a/ext/standard/tests/mail/ezmlm_hash_error.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_error.phpt @@ -32,7 +32,7 @@ echo "\n-- Testing ezmlm_hash() function with invalid input - RESOURCE --\n"; $file_handle = fopen(__FILE__, "r"); $extra_arg = 10; var_dump( ezmlm_hash($file_handle) ); -fclose($file_handle); +fclose($file_handle); ?> ===DONE=== diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt index 123195e5ec..58957c84a9 100644 --- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index ddc5571c7e..70f32df40f 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path=tee mailBasic.out >/dev/null mail.add_x_header = Off @@ -11,9 +11,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index aa1e0b1ecd..60ad009190 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -11,9 +11,9 @@ mail.add_x_header = Off --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 3bab805649..3e648e5cac 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index c7f8ff9824..de2407a740 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index c6cc005dd5..8d755ebb86 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; 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/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index eb4c47271f..fc50498347 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); @@ -14,9 +14,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -39,7 +39,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -49,10 +49,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -63,22 +63,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index dedb1e3ff8..892d92391e 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ $extra_headers = "from: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index 5d1ec6b7a3..1caa68c068 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ $extra_headers = "FRom: user@example.com"; $res = mail($to, $subject, $message, $extra_headers); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index c90e909c6f..c8e45242e2 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ $extra_parameters = "addons"; // should be ignored $res = mail($to, $subject, $message, $extra_headers, $extra_parameters); if ($res !== true) { - exit("TEST FAILED : Unable to send test email\n"); + exit("TEST FAILED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_error.phpt b/ext/standard/tests/mail/mail_error.phpt index efecd162e9..871b6da0be 100644 --- a/ext/standard/tests/mail/mail_error.phpt +++ b/ext/standard/tests/mail/mail_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test mail() function : error conditions +Test mail() function : error conditions --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : error conditions ***\n"; diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index fd40f97b68..a8eb6bec79 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : variation ***\n"; diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index 7e78bcfade..f0e44241b1 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -12,9 +12,9 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing mail() : basic functionality ***\n"; diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index 258bf31377..dd7fd937e2 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 4c8ee2ff6c..817cc36af4 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -38,7 +38,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt index ae6e308715..4062fae981 100644 --- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt @@ -1,7 +1,7 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- -<?php +<?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { die('skip...Windows only test'); } @@ -13,9 +13,9 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c - * Alias to functions: + * Alias to functions: */ error_reporting(E_ALL & ~E_STRICT); @@ -37,7 +37,7 @@ HERE; $res = mail($to, $subject, $message); if ($res !== true) { - exit("TEST COMPLETED : Unable to send test email\n"); + exit("TEST COMPLETED : Unable to send test email\n"); } else { echo "Msg sent OK\n"; } @@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password); if ($imap_stream === false) { echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n"; return false; -} +} $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered @@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) { // Iterate over recent msgs to find the one we sent above for ($i = 1; $i <= $current_msg_count; $i++) { // get hdr details - $hdr = imap_headerinfo($imap_stream, $i); + $hdr = imap_headerinfo($imap_stream, $i); if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) { - echo "Id of msg just sent is $i\n"; - echo ".. delete it\n"; + echo "Id of msg just sent is $i\n"; + echo ".. delete it\n"; imap_delete($imap_stream, $i); $found = true; - break; + break; } } - + $repeat_count -= 1; } -if (!$found) { - echo "TEST FAILED: email not delivered\n"; +if (!$found) { + echo "TEST FAILED: email not delivered\n"; } else { echo "TEST PASSED: Msgs sent and deleted OK\n"; } 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 0665e5bfa3..bc62b38752 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test abs() function : basic functionality +Test abs() function : basic functionality --INI-- precision = 14 --FILE-- @@ -20,11 +20,11 @@ $values = array(23, "23", "-23", "23.45", - "2.345e1", - "-2.345e1", + "2.345e1", + "-2.345e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = abs($values[$i]); @@ -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_basiclong_64bit.phpt b/ext/standard/tests/math/abs_basiclong_64bit.phpt index 0f0cb5d55c..ccb2556427 100644 --- a/ext/standard/tests/math/abs_basiclong_64bit.phpt +++ b/ext/standard/tests/math/abs_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(abs($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/abs_error.phpt b/ext/standard/tests/math/abs_error.phpt index 8c2a9f73ce..4d62259afb 100644 --- a/ext/standard/tests/math/abs_error.phpt +++ b/ext/standard/tests/math/abs_error.phpt @@ -10,7 +10,7 @@ Test abs() function : error conditions - incorrect number of args /* * Pass incorrect number of arguments to abs() to test behaviour */ - + echo "*** Testing abs() : error conditions ***\n"; $arg_0 = 1.0; diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index 988eba93de..ed9085446b 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -45,7 +45,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -55,7 +55,7 @@ $inputs = array( /*19*/ "abs", 'abs', $heredoc, - + // object data /*22*/ new classA(), @@ -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 -- @@ -132,4 +132,4 @@ int(0) -- Iteration 16 -- int(%d) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/math/acos_basic.phpt b/ext/standard/tests/math/acos_basic.phpt index a5af21e958..150eb975ad 100644 --- a/ext/standard/tests/math/acos_basic.phpt +++ b/ext/standard/tests/math/acos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input acos() precision = 14 --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/acos_basiclong_64bit.phpt b/ext/standard/tests/math/acos_basiclong_64bit.phpt index a32180cd1b..3d811f5928 100644 --- a/ext/standard/tests/math/acos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acos_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(acos($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt index 6a9dd909a5..6cfdb8f857 100644 --- a/ext/standard/tests/math/acos_error.phpt +++ b/ext/standard/tests/math/acos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acos() --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt index 5575ec5796..fa9f5e48ac 100644 --- a/ext/standard/tests/math/acos_variation.phpt +++ b/ext/standard/tests/math/acos_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of acos() precision=10 --FILE-- <?php -/* +/* * proto float acos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test acos with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = acos($values[$i]); diff --git a/ext/standard/tests/math/acosh_basic.phpt b/ext/standard/tests/math/acosh_basic.phpt index ba1a706574..d94109d9c1 100644 --- a/ext/standard/tests/math/acosh_basic.phpt +++ b/ext/standard/tests/math/acosh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input acosh() precision = 14 --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/acosh_basiclong_64bit.phpt b/ext/standard/tests/math/acosh_basiclong_64bit.phpt index 902c235c32..80c33b224b 100644 --- a/ext/standard/tests/math/acosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/acosh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(acosh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/acosh_error.phpt b/ext/standard/tests/math/acosh_error.phpt index 270796c373..cb85becdb1 100644 --- a/ext/standard/tests/math/acosh_error.phpt +++ b/ext/standard/tests/math/acosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for acosh() --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt index cc89ce3e76..6f8abb19ae 100644 --- a/ext/standard/tests/math/acosh_variation.phpt +++ b/ext/standard/tests/math/acosh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of acosh() precision = 10 --FILE-- <?php -/* +/* * proto float acosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test acosh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = acosh($values[$i]); diff --git a/ext/standard/tests/math/asin_basic.phpt b/ext/standard/tests/math/asin_basic.phpt index 7c7542e0f6..183f7449bb 100644 --- a/ext/standard/tests/math/asin_basic.phpt +++ b/ext/standard/tests/math/asin_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input asin() precision = 14 --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/asin_basiclong_64bit.phpt b/ext/standard/tests/math/asin_basiclong_64bit.phpt index 071ad1c39c..7e17f2daff 100644 --- a/ext/standard/tests/math/asin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(asin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asin_error.phpt b/ext/standard/tests/math/asin_error.phpt index 2428e8a5b4..a51a077b90 100644 --- a/ext/standard/tests/math/asin_error.phpt +++ b/ext/standard/tests/math/asin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asin() --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt index c8063849fd..8259bc811d 100644 --- a/ext/standard/tests/math/asin_variation.phpt +++ b/ext/standard/tests/math/asin_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of asin() precision = 10 --FILE-- <?php -/* +/* * proto float asin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test asin with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = asin($values[$i]); diff --git a/ext/standard/tests/math/asinh_basic.phpt b/ext/standard/tests/math/asinh_basic.phpt index 31643fa3c4..ff8a2d10ac 100644 --- a/ext/standard/tests/math/asinh_basic.phpt +++ b/ext/standard/tests/math/asinh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input asinh() precision = 14 --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/asinh_basiclong_64bit.phpt b/ext/standard/tests/math/asinh_basiclong_64bit.phpt index f4ccb0d23b..a501d75d3c 100644 --- a/ext/standard/tests/math/asinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/asinh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(asinh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/asinh_error.phpt b/ext/standard/tests/math/asinh_error.phpt index ad6bf36014..8a0d558783 100644 --- a/ext/standard/tests/math/asinh_error.phpt +++ b/ext/standard/tests/math/asinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for asinh() --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt index 5e41a45900..77bf4d8998 100644 --- a/ext/standard/tests/math/asinh_variation.phpt +++ b/ext/standard/tests/math/asinh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of asinh() precision = 10 --FILE-- <?php -/* +/* * proto float asinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test asinh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = asinh($values[$i]); diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index c387cad439..8312bb2890 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -12,11 +12,11 @@ $valuesy = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, false); - + $valuesx = array(23, -23, 2.345e1, @@ -25,20 +25,20 @@ $valuesx = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, - false); + false); for ($i = 0; $i < count($valuesy); $i++) { - for ($j = 0; $j < count($valuesx); $j++) { + for ($j = 0; $j < count($valuesx); $j++) { $res = atan2($valuesy[$i], $valuesx[$j]); echo "Y:$valuesy[$i] X:$valuesx[$j] "; var_dump($res); - } + } } ?> ---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/atan2_basiclong_64bit.phpt b/ext/standard/tests/math/atan2_basiclong_64bit.phpt index f646585f30..e0548a08ee 100644 --- a/ext/standard/tests/math/atan2_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan2_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(atan2($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt index 7f9be489e7..15aef71359 100644 --- a/ext/standard/tests/math/atan2_variation1.phpt +++ b/ext/standard/tests/math/atan2_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt index 120ac45eb5..2de0bb2eec 100644 --- a/ext/standard/tests/math/atan2_variation2.phpt +++ b/ext/standard/tests/math/atan2_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan_basic.phpt b/ext/standard/tests/math/atan_basic.phpt index 180263fe59..f4a2bedf76 100644 --- a/ext/standard/tests/math/atan_basic.phpt +++ b/ext/standard/tests/math/atan_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input atan() precision = 14 --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/atan_basiclong_64bit.phpt b/ext/standard/tests/math/atan_basiclong_64bit.phpt index 15d9a000ae..ffdfe24372 100644 --- a/ext/standard/tests/math/atan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atan_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(atan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atan_error.phpt b/ext/standard/tests/math/atan_error.phpt index 0a57818088..61b35b05d6 100644 --- a/ext/standard/tests/math/atan_error.phpt +++ b/ext/standard/tests/math/atan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atan() --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt index b6a9a9ec32..797d88d2d2 100644 --- a/ext/standard/tests/math/atan_variation.phpt +++ b/ext/standard/tests/math/atan_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of atan() precision = 10 --FILE-- <?php -/* +/* * proto float atan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test atan with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = atan($values[$i]); diff --git a/ext/standard/tests/math/atanh_basic.phpt b/ext/standard/tests/math/atanh_basic.phpt index 87580ef181..7e7144e239 100644 --- a/ext/standard/tests/math/atanh_basic.phpt +++ b/ext/standard/tests/math/atanh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input atanh() precision = 14 --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/atanh_basiclong_64bit.phpt b/ext/standard/tests/math/atanh_basiclong_64bit.phpt index 426ca51f2a..d7608cad1d 100644 --- a/ext/standard/tests/math/atanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/atanh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(atanh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/atanh_error.phpt b/ext/standard/tests/math/atanh_error.phpt index c62dadf027..e442825b0e 100644 --- a/ext/standard/tests/math/atanh_error.phpt +++ b/ext/standard/tests/math/atanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for atanh() --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt index 2b0a4b1085..984d399a85 100644 --- a/ext/standard/tests/math/atanh_variation.phpt +++ b/ext/standard/tests/math/atanh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of atanh() precision = 10 --FILE-- <?php -/* +/* * proto float atanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test atanh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = atanh($values[$i]); diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 2c18d45e1a..0da1d1f77c 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -9,27 +9,27 @@ $values = array(10, 27, 39, 03, - 0x5F, + 0x5F, "10", "27", "39", - "5F", + "5F", "3XYZ" - ); + ); for ($f= 0; $f < count($frombase); $f++) { echo "\n...from base is ", $frombase[$f], "\n"; for ($t= 0; $t < count($tobase); $t++) { - echo "......to base is ", $tobase[$t], "\n"; - for ($i =0; $i < count($values); $i++){ + echo "......to base is ", $tobase[$t], "\n"; + for ($i =0; $i < count($values); $i++){ $res = base_convert($values[$i],$frombase[$f],$tobase[$t]); echo ".........value= ", $values[$i], " res = ", $res, "\n"; - } - } + } + } } ?> ---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 a05268ab94..c11a01b03f 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
\ No newline at end of file diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index a285ece2a2..afa0c5bb8a 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -27,7 +27,7 @@ $inputs = array( /*1*/ 0, 1, 12, - -12, + -12, 2147483647, // float data @@ -46,7 +46,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -56,7 +56,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt index c384d08d74..14593ffe76 100644 --- a/ext/standard/tests/math/base_convert_variation2.phpt +++ b/ext/standard/tests/math/base_convert_variation2.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, @@ -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 8c3316b84f..bd4f052ca6 100644 --- a/ext/standard/tests/math/base_convert_variation3.phpt +++ b/ext/standard/tests/math/base_convert_variation3.phpt @@ -24,7 +24,7 @@ $inputs = array( /*1*/ 0, 1, -1, - -12, + -12, 2147483647, // float data @@ -43,7 +43,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -53,7 +53,7 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*23*/ @$undefined_var, @@ -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..d746b8a1ca 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -23,17 +23,17 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($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..3641f0bc41 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -23,17 +23,17 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt index 488ab538ed..3cc57d5dc4 100644 --- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt @@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $binLongStrs = array( - '0'.str_repeat('1',63), - str_repeat('1',64), - '0'.str_repeat('1',31), - str_repeat('1',32), + '0'.str_repeat('1',63), + str_repeat('1',64), + '0'.str_repeat('1',31), + str_repeat('1',32), '0'.str_repeat('1',64), - str_repeat('1',65), - '0'.str_repeat('1',32), + str_repeat('1',65), + '0'.str_repeat('1',32), str_repeat('1',33) ); @@ -28,7 +28,7 @@ foreach ($binLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(bindec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt index 8bd52332c4..aa6ac9cdd1 100644 --- a/ext/standard/tests/math/bindec_error.phpt +++ b/ext/standard/tests/math/bindec_error.phpt @@ -10,7 +10,7 @@ Test bindec() function : error conditions - incorrect input /* * Pass incorrect input to bindec() to test behaviour */ - + echo "*** Testing bindec() : error conditions ***\n"; // get a class diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 9efadf6e5c..1e188bab34 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index ab667126da..0a37c4c2f9 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*22*/ @$undefined_var, 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/bug25665.phpt b/ext/standard/tests/math/bug25665.phpt index 120604aff2..469236c943 100644 --- a/ext/standard/tests/math/bug25665.phpt +++ b/ext/standard/tests/math/bug25665.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25665 (var_dump () hangs on Nan and INF) --SKIPIF-- -<?php +<?php $OS = strtoupper(PHP_OS); if ($OS == 'SUNOS' || $OS == 'SOLARIS') die("SKIP Solaris acos() returns wrong value"); ?> diff --git a/ext/standard/tests/math/bug45712.phpt b/ext/standard/tests/math/bug45712.phpt index 23c3b6ddd3..2aa4386587 100644 --- a/ext/standard/tests/math/bug45712.phpt +++ b/ext/standard/tests/math/bug45712.phpt @@ -14,7 +14,7 @@ var_dump($nan==50); var_dump($nan=='500'); var_dump($nan=='abc'); var_dump($nan==$nan); -// +// var_dump($nan===''); var_dump($nan===0.5); var_dump($nan===50); @@ -33,7 +33,7 @@ var_dump($inf==50); var_dump($inf=='500'); var_dump($inf=='abc'); var_dump($inf==$inf); -// +// var_dump($inf===''); var_dump($inf===0.5); var_dump($inf===50); diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index 3a4bb0c293..922d0b14f0 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -25,7 +25,7 @@ $values = array(0, 2.6, -2.6, 037, - 0x5F, + 0x5F, "10.5", "-10.5", "3.95E3", @@ -33,8 +33,8 @@ $values = array(0, "039", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = ceil($values[$i]); @@ -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_basiclong_64bit.phpt b/ext/standard/tests/math/ceil_basiclong_64bit.phpt index 42d9f6b413..b4c23d85cd 100644 --- a/ext/standard/tests/math/ceil_basiclong_64bit.phpt +++ b/ext/standard/tests/math/ceil_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(ceil($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index e68dd8b878..35a9e1d4a3 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), @@ -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/constants_basic.phpt b/ext/standard/tests/math/constants_basic.phpt index f44c6de4ff..0220d93355 100644 --- a/ext/standard/tests/math/constants_basic.phpt +++ b/ext/standard/tests/math/constants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test for pre-defined math constants +Test for pre-defined math constants --INI-- precision=14 --FILE-- diff --git a/ext/standard/tests/math/cos_basic.phpt b/ext/standard/tests/math/cos_basic.phpt index 8ad7010ce1..f0cfa66ee5 100644 --- a/ext/standard/tests/math/cos_basic.phpt +++ b/ext/standard/tests/math/cos_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input cos() precision = 14 --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/cos_basiclong_64bit.phpt b/ext/standard/tests/math/cos_basiclong_64bit.phpt index 12355a7d86..c9f041783b 100644 --- a/ext/standard/tests/math/cos_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cos_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(cos($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cos_error.phpt b/ext/standard/tests/math/cos_error.phpt index 21d4692a7a..40901991e0 100644 --- a/ext/standard/tests/math/cos_error.phpt +++ b/ext/standard/tests/math/cos_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cos() --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt index 6323042dc7..418bbf658f 100644 --- a/ext/standard/tests/math/cos_variation.phpt +++ b/ext/standard/tests/math/cos_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of cos() precision = 10 --FILE-- <?php -/* +/* * proto float cos(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test cos with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = cos($values[$i]); diff --git a/ext/standard/tests/math/cosh_basic.phpt b/ext/standard/tests/math/cosh_basic.phpt index e6cfd868a0..0a637ca8e5 100644 --- a/ext/standard/tests/math/cosh_basic.phpt +++ b/ext/standard/tests/math/cosh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input cosh() precision = 14 --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/cosh_basiclong_64bit.phpt b/ext/standard/tests/math/cosh_basiclong_64bit.phpt index f065b47213..0916839381 100644 --- a/ext/standard/tests/math/cosh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/cosh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(cosh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/cosh_error.phpt b/ext/standard/tests/math/cosh_error.phpt index c540f72a20..afed24fe3b 100644 --- a/ext/standard/tests/math/cosh_error.phpt +++ b/ext/standard/tests/math/cosh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for cosh() --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt index cd64670668..7a6cff2fd9 100644 --- a/ext/standard/tests/math/cosh_variation.phpt +++ b/ext/standard/tests/math/cosh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of cosh() precision = 10 --FILE-- <?php -/* +/* * proto float cosh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test cosh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = cosh($values[$i]); diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 0cae2d9076..00ed582559 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,8 +14,8 @@ $values = array(10, "0x5F", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = decbin($values[$i]); @@ -23,7 +23,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- string(4) "1010" string(12) "111101101110" string(12) "111101101110" diff --git a/ext/standard/tests/math/decbin_basiclong_64bit.phpt b/ext/standard/tests/math/decbin_basiclong_64bit.phpt index a2e9185ab5..3dc61c4e28 100644 --- a/ext/standard/tests/math/decbin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decbin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(decbin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index e0a2db85ea..007c998e48 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -2,14 +2,10 @@ 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 ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index b6341cca76..b357c279b3 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -38,8 +38,8 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal - 4294967296, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index b2209ba301..e82ee3e88c 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -38,8 +38,8 @@ $inputs = array( 1, 12345, -2345, - 18446744073709551615, // largest decimal - 18446744073709551616, + 18446744073709551615, // largest decimal + 18446744073709551616, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index 439beea3ef..c842bf7984 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,15 +14,15 @@ $values = array(10, "0x5F", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = dechex($values[$i]); var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(1) "a" string(3) "f6e" string(3) "f6e" diff --git a/ext/standard/tests/math/dechex_basiclong_64bit.phpt b/ext/standard/tests/math/dechex_basiclong_64bit.phpt index 135a422f66..40b0879246 100644 --- a/ext/standard/tests/math/dechex_basiclong_64bit.phpt +++ b/ext/standard/tests/math/dechex_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(dechex($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt index 4c3fd6f858..7ed0c4598c 100644 --- a/ext/standard/tests/math/dechex_error.phpt +++ b/ext/standard/tests/math/dechex_error.phpt @@ -9,7 +9,7 @@ Test dechex() - wrong params dechex() echo "*** Testing dechex() : error conditions ***\n"; -echo "\nIncorrect number of arguments\n"; +echo "\nIncorrect number of arguments\n"; dechex(); dechex(23,2,true); diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index ee51c134d5..5bcd2b5c5d 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -37,9 +37,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index 404e9dfd82..a513264df2 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -37,10 +37,10 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 18446744073709551615, // largest decimal - 18446744073709551616, - + -2345, + 18446744073709551615, // largest decimal + 18446744073709551616, + // float data /*7*/ 10.5, -10.5, @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -69,8 +69,8 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index b9d9ebc060..a3dd741b41 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,15 +14,15 @@ $values = array(10, "0x5F", true, false, - null, - ); + null, + ); for ($i = 0; $i < count($values); $i++) { $res = decoct($values[$i]); var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(2) "12" string(4) "7556" string(4) "7556" diff --git a/ext/standard/tests/math/decoct_basiclong_64bit.phpt b/ext/standard/tests/math/decoct_basiclong_64bit.phpt index f1812b9062..d7434176db 100644 --- a/ext/standard/tests/math/decoct_basiclong_64bit.phpt +++ b/ext/standard/tests/math/decoct_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(decoct($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index 85230df2b3..49ba57f54b 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 14a978b2b3..40afafa10a 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -38,9 +38,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 18446744073709551615, // largest decimal - 18446744073709551616, + -2345, + 18446744073709551615, // largest decimal + 18446744073709551616, // float data /*7*/ 10.5, @@ -58,7 +58,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -68,10 +68,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/deg2rad_basic.phpt b/ext/standard/tests/math/deg2rad_basic.phpt index 3b756281fa..64771b9980 100644 --- a/ext/standard/tests/math/deg2rad_basic.phpt +++ b/ext/standard/tests/math/deg2rad_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input deg2rad() precision = 14 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt index 3a14b11825..c64627661d 100644 --- a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt +++ b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(deg2rad($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/deg2rad_error.phpt b/ext/standard/tests/math/deg2rad_error.phpt index 4bdad8cdb8..517680a7c3 100644 --- a/ext/standard/tests/math/deg2rad_error.phpt +++ b/ext/standard/tests/math/deg2rad_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for deg2rad() precision = 14 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt index d5f6920ea7..737be67772 100644 --- a/ext/standard/tests/math/deg2rad_variation.phpt +++ b/ext/standard/tests/math/deg2rad_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of deg2rad() precision = 10 --FILE-- <?php -/* +/* * proto float deg2rad(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test deg2rad with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = deg2rad($values[$i]); diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 69d29fa5a4..21f7413d82 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -8,15 +8,15 @@ $values = array(10, 10.3, 3.9505e3, 037, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", "039", true, false, - null, - ); + null, + ); $iterator = 1; foreach($values as $value) { @@ -27,7 +27,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/exp_basiclong_64bit.phpt b/ext/standard/tests/math/exp_basiclong_64bit.phpt index 75518548e3..5156d055a4 100644 --- a/ext/standard/tests/math/exp_basiclong_64bit.phpt +++ b/ext/standard/tests/math/exp_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(exp($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/exp_variation1.phpt b/ext/standard/tests/math/exp_variation1.phpt index 5305b63660..150e0cee8a 100644 --- a/ext/standard/tests/math/exp_variation1.phpt +++ b/ext/standard/tests/math/exp_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 00f8762ad5..7853aeb20c 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ @@ -15,15 +15,15 @@ $values = array(10, 10.3, 3.9505e3, 037, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", "039", true, false, - null, - ); + null, + ); // loop through each element of $values to check the behaviour of expm1() $iterator = 1; @@ -34,7 +34,7 @@ foreach($values as $value) { }; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing expm1() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/math/expm1_basiclong_64bit.phpt b/ext/standard/tests/math/expm1_basiclong_64bit.phpt index 9046764d02..6963976777 100644 --- a/ext/standard/tests/math/expm1_basiclong_64bit.phpt +++ b/ext/standard/tests/math/expm1_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(expm1($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/expm1_error.phpt b/ext/standard/tests/math/expm1_error.phpt index f743e48d18..380633b67b 100644 --- a/ext/standard/tests/math/expm1_error.phpt +++ b/ext/standard/tests/math/expm1_error.phpt @@ -3,7 +3,7 @@ Test expm1() - Error conditions --FILE-- <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/expm1_variation1.phpt b/ext/standard/tests/math/expm1_variation1.phpt index de51bc7e75..a342d25a7c 100644 --- a/ext/standard/tests/math/expm1_variation1.phpt +++ b/ext/standard/tests/math/expm1_variation1.phpt @@ -6,7 +6,7 @@ precision=14 <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ @@ -37,7 +37,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, // float data /*5*/ 10.5, @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -65,14 +65,14 @@ $inputs = array( /*19*/ "abcxyz", 'abcxyz', $heredoc, - + // array data array(), array(1,2,4), - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index e21e893ab3..034f55f00e 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -21,7 +21,7 @@ $values = array(0, 2.6, -2.6, 037, - 0x5F, + 0x5F, "10.5", "-10.5", "3.95E3", @@ -29,17 +29,17 @@ $values = array(0, "039", true, false, - null, - ); - + null, + ); + foreach($values as $value) { echo "\n-- floor $value --\n"; var_dump(floor($value)); -}; +}; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing floor() : basic functionality *** -- floor 0 -- diff --git a/ext/standard/tests/math/floor_basiclong_64bit.phpt b/ext/standard/tests/math/floor_basiclong_64bit.phpt index 6b768ef90c..65a50fc083 100644 --- a/ext/standard/tests/math/floor_basiclong_64bit.phpt +++ b/ext/standard/tests/math/floor_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(floor($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index adf12551f4..fcb895164a 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /* 7*/ "", '', @@ -49,7 +49,7 @@ $inputs = array( /*10*/ "abcxyz", 'abcxyz}', $heredoc, - + // object data /*13*/ new classA(), @@ -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/floorceil.phpt b/ext/standard/tests/math/floorceil.phpt index 55395dba3d..2f7d82c6e6 100644 --- a/ext/standard/tests/math/floorceil.phpt +++ b/ext/standard/tests/math/floorceil.phpt @@ -2,22 +2,22 @@ Tests for floor en ceil --FILE-- <?php - $a = ceil (-0); $b = ceil (-1); $c = ceil (-1.5); + $a = ceil (-0); $b = ceil (-1); $c = ceil (-1.5); $d = ceil (-1.8); $e = ceil (-2.7); var_dump ($a, $b, $c, $d, $e); - + $a = ceil (0); $b = ceil (0.5); $c = ceil (1); $d = ceil (1.5); $e = ceil (1.8); $f = ceil (2.7); var_dump ($a, $b, $c, $d, $e, $f); - + $a = floor (-0); $b = floor (-0.5); $c = floor (-1); $d = floor (-1.5); $e = floor (-1.8); $f = floor (-2.7); var_dump ($a, $b, $c, $d, $e, $f); - + $a = floor (0); $b = floor (0.5); $c = floor (1); $d = floor (1.5); $e = floor (1.8); $f = floor (2.7); var_dump ($a, $b, $c, $d, $e, $f); -?> +?> --EXPECT-- float(0) float(-1) diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index d10f08af0d..003a49498e 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -12,11 +12,11 @@ $values1 = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, - false); - + false); + $values2 = array(2, -2, 2.3e1, @@ -25,20 +25,20 @@ $values2 = array(2, 02, "2", "2.3", - "2.3e1", + "2.3e1", null, true, - false); + false); for ($i = 0; $i < count($values1); $i++) { - echo "\niteration ", $i, "\n"; - + echo "\niteration ", $i, "\n"; + for ($j = 0; $j < count($values2); $j++) { $res = fmod($values1[$i], $values2[$j]); var_dump($res); - } + } } ?> ---EXPECTF-- +--EXPECT-- iteration 0 float(0) diff --git a/ext/standard/tests/math/fmod_basiclong_64bit.phpt b/ext/standard/tests/math/fmod_basiclong_64bit.phpt index 6513e31159..1502b651e2 100644 --- a/ext/standard/tests/math/fmod_basiclong_64bit.phpt +++ b/ext/standard/tests/math/fmod_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(fmod($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/fmod_variation1.phpt b/ext/standard/tests/math/fmod_variation1.phpt index 345d74c431..0f0d826ac9 100644 --- a/ext/standard/tests/math/fmod_variation1.phpt +++ b/ext/standard/tests/math/fmod_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/fmod_variation2.phpt b/ext/standard/tests/math/fmod_variation2.phpt index 6c5fc82541..12fae1a758 100644 --- a/ext/standard/tests/math/fmod_variation2.phpt +++ b/ext/standard/tests/math/fmod_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 08303ad20c..796c4e9bae 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -19,17 +19,17 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = hexdec($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 fff7185ef1..8c2942fb71 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -21,20 +21,20 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, - null); + null); foreach($values as $value) { echo "\n-- hexdec $value --\n"; var_dump(hexdec($value)); -}; - +}; + ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hexdec() : basic functionality *** -- hexdec 1194684 -- diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt index 225e42018b..29c684a155 100644 --- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt @@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $hexLongStrs = array( - '7'.str_repeat('f',15), - str_repeat('f',16), - '7'.str_repeat('f',7), - str_repeat('f',8), + '7'.str_repeat('f',15), + str_repeat('f',16), + '7'.str_repeat('f',7), + str_repeat('f',8), '7'.str_repeat('f',16), str_repeat('f',18), - '7'.str_repeat('f',8), + '7'.str_repeat('f',8), str_repeat('f',9) ); @@ -28,7 +28,7 @@ foreach ($hexLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(hexdec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt index 7b65e5623a..c45c2aa92b 100644 --- a/ext/standard/tests/math/hexdec_error.phpt +++ b/ext/standard/tests/math/hexdec_error.phpt @@ -3,7 +3,7 @@ Test hexdec() - wrong params test hexdec() --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 34b2e474d0..2b3f1b6ab3 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ @@ -32,9 +32,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index f70a48eeb2..65beb2d91b 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ @@ -32,9 +32,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index 107d3e40de..c280a23bb2 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -20,12 +20,12 @@ $valuesy = array(23, 027, "23", "23.45", - "2.345e1", - "23abc", + "2.345e1", + "23abc", null, true, false); - + $valuesx = array(33, -33, 3.345e1, @@ -35,17 +35,17 @@ $valuesx = array(33, "33", "43.45", "1.345e1", - "33abc", + "33abc", null, true, - false); + false); for ($i = 0; $i < count($valuesy); $i++) { - for ($j = 0; $j < count($valuesx); $j++) { + for ($j = 0; $j < count($valuesx); $j++) { echo "\nY:$valuesy[$i] X:$valuesx[$j] "; $res = hypot($valuesy[$i], $valuesx[$j]); var_dump($res); - } + } } ?> ===Done=== diff --git a/ext/standard/tests/math/hypot_basiclong_64bit.phpt b/ext/standard/tests/math/hypot_basiclong_64bit.phpt index 3bbfcb4afc..241fa9c4e9 100644 --- a/ext/standard/tests/math/hypot_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hypot_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(hypot($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt index b816cd58a0..b357a3a809 100644 --- a/ext/standard/tests/math/hypot_error.phpt +++ b/ext/standard/tests/math/hypot_error.phpt @@ -6,7 +6,7 @@ Test hypot() - wrong params test hypot() * Description: Calculate the length of the hypotenuse of a right-angle triangle. * Source code: ext/standard/math.c */ - + echo "*** Testing hypot() : error conditions ***\n"; echo "\n-- Testing hypot() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt index 762bc58727..b083822c10 100644 --- a/ext/standard/tests/math/hypot_variation1.phpt +++ b/ext/standard/tests/math/hypot_variation1.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt index 989e7d00ae..393e5eb9d1 100644 --- a/ext/standard/tests/math/hypot_variation2.phpt +++ b/ext/standard/tests/math/hypot_variation2.phpt @@ -33,7 +33,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -52,7 +52,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -62,10 +62,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index c674dd3b85..acc7f4ef98 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)
\ No newline at end of file diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 5906517658..3b80c969d9 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -10,19 +10,19 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_finite($values[$i]); - var_dump($res); + var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt index 201d8473fa..bbc43f7349 100644 --- a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_finite($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_finite_variation1.phpt b/ext/standard/tests/math/is_finite_variation1.phpt index 498d0b2717..4f6288f5df 100644 --- a/ext/standard/tests/math/is_finite_variation1.phpt +++ b/ext/standard/tests/math/is_finite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 508c5839bb..2ae5679285 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -10,19 +10,19 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); + acos(1.01)); ; for ($i = 0; $i < count($values); $i++) { $res = is_infinite($values[$i]); - var_dump($res); + var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt index ca53b77f0c..ab15ec71f0 100644 --- a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_infinite($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_infinite_variation1.phpt b/ext/standard/tests/math/is_infinite_variation1.phpt index 0f57209b98..e7228dd7c5 100644 --- a/ext/standard/tests/math/is_infinite_variation1.phpt +++ b/ext/standard/tests/math/is_infinite_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index 05db70db76..a7998e1314 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -10,22 +10,22 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, pow(0, -2), - acos(1.01)); - + acos(1.01)); + for ($i = 0; $i < count($values); $i++) { $res = is_nan($values[$i]); - var_dump($res); + var_dump($res); } - + ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt index ca85db1660..6f66d6b71e 100644 --- a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(is_nan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/is_nan_variation1.phpt b/ext/standard/tests/math/is_nan_variation1.phpt index 9cd24cfd91..3106d30d74 100644 --- a/ext/standard/tests/math/is_nan_variation1.phpt +++ b/ext/standard/tests/math/is_nan_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt index b2e50f86f8..8fc95190c6 100644 --- a/ext/standard/tests/math/lcg_value_basic.phpt +++ b/ext/standard/tests/math/lcg_value_basic.phpt @@ -9,7 +9,7 @@ echo "MATHS test script started\n"; echo "\n lcg_value tests...\n"; for ($i = 0; $i < 100; $i++) { $res = lcg_value(); - + if (!is_float($res) || $res < 0 || $res > 1) { break; } @@ -17,40 +17,42 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED\n"; -} else { +} else { 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..31c5e2ae85 100644 --- a/ext/standard/tests/math/log.phpt +++ b/ext/standard/tests/math/log.phpt @@ -1,13 +1,13 @@ --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)); // e ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "$x : $x2\n"; } @@ -19,8 +19,8 @@ for ($base = 2; $base < 11; $base++) { for ($x = 0, $count= 0; $x < 50; $x++) { $x2 = (int) pow($base, log($x, $base)); // base ^ log(x) should be close in range to x - if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { - $count++; + if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { + $count++; } else { print "base $base: $x : $x2\n"; } diff --git a/ext/standard/tests/math/log10_basic.phpt b/ext/standard/tests/math/log10_basic.phpt index 3ea14b59ac..0877df23d7 100644 --- a/ext/standard/tests/math/log10_basic.phpt +++ b/ext/standard/tests/math/log10_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input log10() precision = 14 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/log10_basiclong_64bit.phpt b/ext/standard/tests/math/log10_basiclong_64bit.phpt index 2eb2d544b6..be1b7eff7d 100644 --- a/ext/standard/tests/math/log10_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log10_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log10($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log10_error.phpt b/ext/standard/tests/math/log10_error.phpt index f4e5da8f48..e3bc604fd2 100644 --- a/ext/standard/tests/math/log10_error.phpt +++ b/ext/standard/tests/math/log10_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for log10() precision = 14 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt index 5304325952..ca41a0dbd5 100644 --- a/ext/standard/tests/math/log10_variation.phpt +++ b/ext/standard/tests/math/log10_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of log10() precision = 10 --FILE-- <?php -/* +/* * proto float log10(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test log10 with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = log10($values[$i]); diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index 76d51b0d9b..b6d14a26e7 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ @@ -20,22 +20,22 @@ $values = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, - false); + false); echo "\n LOG1p tests\n"; foreach($values as $value) { echo "\n-- log1p $value --\n"; var_dump(log1p($value)); -}; +}; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing log1p() : basic functionality *** LOG1p tests diff --git a/ext/standard/tests/math/log1p_basiclong_64bit.phpt b/ext/standard/tests/math/log1p_basiclong_64bit.phpt index 05580ff731..a0b32bdce9 100644 --- a/ext/standard/tests/math/log1p_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log1p_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log1p($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt index 09d63be128..e0b01a19ac 100644 --- a/ext/standard/tests/math/log1p_error.phpt +++ b/ext/standard/tests/math/log1p_error.phpt @@ -3,11 +3,11 @@ Test log1p() - Error conditions --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ - + echo "*** Testing log1p() : error conditions ***\n"; echo "\n-- Testing log1p() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/math/log1p_variation1.phpt b/ext/standard/tests/math/log1p_variation1.phpt index b166c302eb..8cd41526f5 100644 --- a/ext/standard/tests/math/log1p_variation1.phpt +++ b/ext/standard/tests/math/log1p_variation1.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, -2147483648, @@ -55,7 +55,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -65,10 +65,10 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*24*/ new classA(), - +/*24*/ new classA(), + // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index a704b9fda8..1b0b628d51 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -12,10 +12,10 @@ $values = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, - false); + false); echo "\n LOG tests...no base\n"; for ($i = 0; $i < count($values); $i++) { @@ -30,7 +30,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- LOG tests...no base float(3.1354942159291) float(NAN) diff --git a/ext/standard/tests/math/log_basiclong_64bit.phpt b/ext/standard/tests/math/log_basiclong_64bit.phpt index 5259899323..9a8f8a6f1d 100644 --- a/ext/standard/tests/math/log_basiclong_64bit.phpt +++ b/ext/standard/tests/math/log_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(log($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt index 5874f63211..c1cde4bcc9 100644 --- a/ext/standard/tests/math/log_variation1.phpt +++ b/ext/standard/tests/math/log_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt index 4ea191e75c..9f5c7313fa 100644 --- a/ext/standard/tests/math/log_variation2.phpt +++ b/ext/standard/tests/math/log_variation2.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 2661c767d5..5ffa059c3f 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -7,8 +7,8 @@ $default_max = mt_getrandmax(); echo "\nmt_rand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n"; for ($i = 0; $i < 100; $i++) { $res = mt_rand(); - -// By default RAND_MAX is 32768 although no constant is defined for it for user space apps + +// By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; } @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { - echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} else { + echo "PASSED: range min = 0 max = ", $default_max, "\n"; +} echo "\nmt_rand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,8 +57,8 @@ $min = array(true, null, "10", "10.5"); - -// Expected numerical equivalent of above non-numerics + +// Expected numerical equivalent of above non-numerics $minval = array(1, 0, 0, @@ -67,19 +67,19 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = mt_rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> ---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 888e7d2bc5..87f5c3641d 100644 --- a/ext/standard/tests/math/mt_rand_error.phpt +++ b/ext/standard/tests/math/mt_rand_error.phpt @@ -14,6 +14,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..38df739baf 100644 --- a/ext/standard/tests/math/mt_rand_variation1.phpt +++ b/ext/standard/tests/math/mt_rand_variation1.phpt @@ -32,7 +32,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -51,7 +51,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -61,10 +61,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..f49d1293f7 100644 --- a/ext/standard/tests/math/mt_rand_variation2.phpt +++ b/ext/standard/tests/math/mt_rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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 e28b1b9eae..a3a34ab73b 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 aa2fc75b74..0858a99e83 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..891152b8a8 100644 --- a/ext/standard/tests/math/mt_srand_variation1.phpt +++ b/ext/standard/tests/math/mt_srand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..330a71b4a7 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -10,10 +10,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo "\n number_format tests.....default\n"; for ($i = 0; $i < count($values); $i++) { @@ -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..2141cc20a4 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -10,10 +10,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo " number_format tests.....multiple character decimal point\n"; for ($i = 0; $i < count($values); $i++) { @@ -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 d10c35cb05..ff584f2514 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -19,17 +19,17 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($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..c77ca722bb 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -22,10 +22,10 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, - null); + null); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); @@ -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/octdec_basiclong_64bit.phpt b/ext/standard/tests/math/octdec_basiclong_64bit.phpt index 4a97a6f414..651b09db39 100644 --- a/ext/standard/tests/math/octdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/octdec_basiclong_64bit.phpt @@ -6,15 +6,15 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $octLongStrs = array( - '777777777777777777777', - '1777777777777777777777', + '777777777777777777777', + '1777777777777777777777', '17777777777', '37777777777', '377777777777777777777777', @@ -28,7 +28,7 @@ foreach ($octLongStrs as $strVal) { echo "--- testing: $strVal ---\n"; var_dump(octdec($strVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index 5d94acc435..ba5f2116bb 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -3,7 +3,7 @@ Test octdec() - wrong params test octdec() --FILE-- <?php /* Prototype : number octdec ( string $octal_string ) - * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. + * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. * Source code: ext/standard/math.c */ @@ -14,7 +14,7 @@ class classA { } -echo "\n-- Incorrect number of arguments --\n"; +echo "\n-- Incorrect number of arguments --\n"; octdec(); octdec('0123567',true); diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt index 42d6a73068..117119600b 100644 --- a/ext/standard/tests/math/octdec_variation1.phpt +++ b/ext/standard/tests/math/octdec_variation1.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : number octdec ( string $octal_string ) - * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. + * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. * Source code: ext/standard/math.c */ @@ -28,9 +28,9 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, - 4294967295, // largest decimal - 4294967296, + -2345, + 4294967295, // largest decimal + 4294967296, // float data /*7*/ 10.5, @@ -48,7 +48,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*18*/ "", '', @@ -58,7 +58,7 @@ $inputs = array( /*21*/ "abcxyz", 'abcxyz', $heredoc, - + // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index c00684edcb..b4d6c8ebe9 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -6,9 +6,9 @@ precision=14 <?php echo pi(), "\n"; echo M_PI, "\n"; -// N.B pi() ignores all specified arguments no error -// messages are produced if arguments are spcified. +// 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 f80cae1962..620091e313 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 a1e8944830..26bae7e0cf 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.phpt b/ext/standard/tests/math/pow_basic.phpt index abd4f26d8e..b7d96ca23b 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -18,9 +18,9 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt index a1cb124767..fc55caccad 100644 --- a/ext/standard/tests/math/pow_basic2.phpt +++ b/ext/standard/tests/math/pow_basic2.phpt @@ -8,7 +8,7 @@ precision=14 $large_exp = 20000; echo "\n-- The following all result in INF --\n"; -var_dump(pow(24, $large_exp)); +var_dump(pow(24, $large_exp)); var_dump(pow(0.24, -$large_exp)); var_dump(pow(-0.24, -$large_exp)); @@ -16,7 +16,7 @@ echo "\n\n-- The following all result in 0 --\n"; var_dump(pow(0.24, $large_exp)); var_dump(pow(-0.24, $large_exp)); var_dump(pow(24, -$large_exp)); -var_dump(pow(-24, -$large_exp)); +var_dump(pow(-24, -$large_exp)); echo "\n\n-- The following all result in -0 --\n"; var_dump(pow(-0.24, $large_exp+1)); diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index eb1441f4fd..fd583a0243 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -18,9 +18,9 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, - -PHP_INT_MAX - 1); + -PHP_INT_MAX - 1); $exponents = array(0, 1, @@ -34,8 +34,8 @@ $exponents = array(0, 500, -500, 2147483647, - -2147483648); - + -2147483648); + foreach($bases as $base) { echo "\n\nBase = $base"; foreach($exponents as $exponent) { @@ -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_basiclong_64bit.phpt b/ext/standard/tests/math/pow_basiclong_64bit.phpt index 722b01c0c7..dfff0f6785 100644 --- a/ext/standard/tests/math/pow_basiclong_64bit.phpt +++ b/ext/standard/tests/math/pow_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN foreach ($longVals as $longVal) { foreach($otherVals as $otherVal) { - echo "--- testing: $longVal, $otherVal ---\n"; + echo "--- testing: $longVal, $otherVal ---\n"; var_dump(pow($longVal, $otherVal)); } } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index 79b5b4d988..3b1befe16b 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..35f9942490 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -38,7 +38,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, PHP_INT_MAX, // float data @@ -57,7 +57,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -67,10 +67,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..d93a952dbe 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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/rad2deg_basic.phpt b/ext/standard/tests/math/rad2deg_basic.phpt index e79e591cf7..0256ffbd90 100644 --- a/ext/standard/tests/math/rad2deg_basic.phpt +++ b/ext/standard/tests/math/rad2deg_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input rad2deg() precision = 14 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt index b3d973387e..4f43ef1368 100644 --- a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt +++ b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(rad2deg($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/rad2deg_error.phpt b/ext/standard/tests/math/rad2deg_error.phpt index e49eea2703..32b2f4dcb6 100644 --- a/ext/standard/tests/math/rad2deg_error.phpt +++ b/ext/standard/tests/math/rad2deg_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for rad2deg() precision = 14 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt index 596a1940a4..935636cd59 100644 --- a/ext/standard/tests/math/rad2deg_variation.phpt +++ b/ext/standard/tests/math/rad2deg_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of rad2deg() precision = 10 --FILE-- <?php -/* +/* * proto float rad2deg(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test rad2deg with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = rad2deg($values[$i]); diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt index f59a7823b4..8dc9fb862c 100644 --- a/ext/standard/tests/math/rand_basic.phpt +++ b/ext/standard/tests/math/rand_basic.phpt @@ -7,8 +7,8 @@ $default_max = getrandmax(); echo "\nrand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n"; for ($i = 0; $i < 100; $i++) { $res = rand(); - -// By default RAND_MAX is 32768 although no constant is defined for it for user space apps + +// By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; } @@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) { if ($i != 100) { echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n"; -} else { +} else { echo "PASSED: range min = 0 max = ", $default_max, "\n"; -} +} echo "\nrand() tests with defined min and max value\n"; @@ -28,28 +28,28 @@ $min = array(10, 10.5e3, 0x10, 0400); - + $max = array(100, 1000, 19.5, 10.5e5, 0x10000, - 0700); + 0700); for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], $max[$x]); - + if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } if ($i == 100) { - echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; } -} +} echo "\nNon-numeric cases\n"; $min = array(true, @@ -57,8 +57,8 @@ $min = array(true, null, "10", "10.5"); - -// Eexepcted numerical equivalent of above non-numerics + +// Eexepcted numerical equivalent of above non-numerics $minval = array(1, 0, 0, @@ -67,16 +67,16 @@ $minval = array(1, for ($x = 0; $x < count($min); $x++) { for ($i = 0; $i < 100; $i++) { $res = rand($min[$x], 100); - + if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) { - echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; + echo "FAILED: res = ", $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; break; } } - + if ($i == 100) { - echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; - } + echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; + } } ?> --EXPECTF-- diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt index f4a868959a..876f79b029 100644 --- a/ext/standard/tests/math/rand_error.phpt +++ b/ext/standard/tests/math/rand_error.phpt @@ -13,6 +13,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..d688524b6e 100644 --- a/ext/standard/tests/math/rand_variation1.phpt +++ b/ext/standard/tests/math/rand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..ed9c9a61c3 100644 --- a/ext/standard/tests/math/rand_variation2.phpt +++ b/ext/standard/tests/math/rand_variation2.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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..72ab13fc3e 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -19,9 +19,9 @@ $values = array(123456789, -4.567E3, 0x234567, 067777777, - "1.234567", + "1.234567", "2.3456789e8"); - + $precision = array(2, 8, 0x3, @@ -30,10 +30,10 @@ $precision = array(2, "2", "04", "3.6", - "2.1e1", + "2.1e1", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { echo "round: $values[$i]\n"; @@ -41,11 +41,11 @@ for ($i = 0; $i < count($values); $i++) { $res = round($values[$i], $precision[$j]); echo "...with precision $precision[$j]-> "; var_dump($res); - } + } } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing round() : basic functionality *** round: 123456789 ...with precision 2-> float(123456789) diff --git a/ext/standard/tests/math/round_basiclong_64bit.phpt b/ext/standard/tests/math/round_basiclong_64bit.phpt index fbae95437f..19db12ed81 100644 --- a/ext/standard/tests/math/round_basiclong_64bit.phpt +++ b/ext/standard/tests/math/round_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(round($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/round_error.phpt b/ext/standard/tests/math/round_error.phpt index eb80722d92..28a6d5cf79 100644 --- a/ext/standard/tests/math/round_error.phpt +++ b/ext/standard/tests/math/round_error.phpt @@ -7,11 +7,11 @@ Test round() function : error conditions - incorrect number of args * after the decimal point) * Source code: ext/standard/math.c */ - + /* * Pass incorrect number of arguments to round() to test behaviour */ - + echo "*** Testing round() : error conditions ***\n"; echo "\n-- Wrong nmumber of arguments --\n"; diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index f0d893aeeb..c1883a5c1b 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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 a90c8832a0..aec4c7f27b 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -35,7 +35,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -54,7 +54,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -64,10 +64,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/math/sin_basic.phpt b/ext/standard/tests/math/sin_basic.phpt index 27579cd289..2b55ad7355 100644 --- a/ext/standard/tests/math/sin_basic.phpt +++ b/ext/standard/tests/math/sin_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sin() precision = 14 --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); @@ -64,7 +64,7 @@ var_dump(sin($twoseventy)); if (allowed_rounding_error(sin($twoseventy),-1.0)) { echo "Pass\n"; } -else { +else { echo "Fail\n"; } diff --git a/ext/standard/tests/math/sin_basiclong_64bit.phpt b/ext/standard/tests/math/sin_basiclong_64bit.phpt index f335b3bd62..55b859a6fd 100644 --- a/ext/standard/tests/math/sin_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sin_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sin($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sin_error.phpt b/ext/standard/tests/math/sin_error.phpt index c6b9f086cd..41a4b2e7af 100644 --- a/ext/standard/tests/math/sin_error.phpt +++ b/ext/standard/tests/math/sin_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sin() --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt index 5b635dfbdc..5d4b5583cc 100644 --- a/ext/standard/tests/math/sin_variation.phpt +++ b/ext/standard/tests/math/sin_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sin() precision = 10 --FILE-- <?php -/* +/* * proto float sin(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sin with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sin($values[$i]); diff --git a/ext/standard/tests/math/sinh_basic.phpt b/ext/standard/tests/math/sinh_basic.phpt index 2bcf42f9fd..79bef6314c 100644 --- a/ext/standard/tests/math/sinh_basic.phpt +++ b/ext/standard/tests/math/sinh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sinh() precision = 14 --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/sinh_basiclong_64bit.phpt b/ext/standard/tests/math/sinh_basiclong_64bit.phpt index a52a48a8db..52068146ea 100644 --- a/ext/standard/tests/math/sinh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sinh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sinh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sinh_error.phpt b/ext/standard/tests/math/sinh_error.phpt index 3f7ba923c3..70decf252f 100644 --- a/ext/standard/tests/math/sinh_error.phpt +++ b/ext/standard/tests/math/sinh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for sinh() --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt index e47e94d629..860f809b88 100644 --- a/ext/standard/tests/math/sinh_variation.phpt +++ b/ext/standard/tests/math/sinh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sinh() precision = 10 --FILE-- <?php -/* +/* * proto float sinh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sinh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sinh($values[$i]); diff --git a/ext/standard/tests/math/sqrt_basic.phpt b/ext/standard/tests/math/sqrt_basic.phpt index ef665a0216..076a113016 100644 --- a/ext/standard/tests/math/sqrt_basic.phpt +++ b/ext/standard/tests/math/sqrt_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 9.0; diff --git a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt index 44fe578548..99091e2c4b 100644 --- a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt +++ b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(sqrt($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/sqrt_error.phpt b/ext/standard/tests/math/sqrt_error.phpt index ac66091838..66d6d27355 100644 --- a/ext/standard/tests/math/sqrt_error.phpt +++ b/ext/standard/tests/math/sqrt_error.phpt @@ -4,10 +4,10 @@ Test wrong number of arguments for sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index 7369b98dfd..e5629ee55c 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of sqrt() precision = 14 --FILE-- <?php -/* +/* * proto float sqrt(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test sqrt with a different input values @@ -22,12 +22,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = sqrt($values[$i]); 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..92140af82a 100644 --- a/ext/standard/tests/math/srand_error.phpt +++ b/ext/standard/tests/math/srand_error.phpt @@ -6,11 +6,11 @@ Test srand() function : error conditions - incorrect number of args * Description: Seed the random number generator. * Source code: ext/standard/rand.c */ - + /* * Pass incorrect number of arguments to srand() to test behaviour */ - + echo "*** Testing srand() : error conditions ***\n"; var_dump(srand(500, 0, true)); @@ -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..3a681e647a 100644 --- a/ext/standard/tests/math/srand_variation1.phpt +++ b/ext/standard/tests/math/srand_variation1.phpt @@ -34,7 +34,7 @@ $inputs = array( /*1*/ 0, 1, 12345, - -2345, + -2345, 2147483647, // float data @@ -53,7 +53,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*17*/ "", '', @@ -63,10 +63,10 @@ $inputs = array( /*20*/ "abcxyz", 'abcxyz', $heredoc, - + // object data -/*23*/ new classA(), - +/*23*/ new classA(), + // undefined data /*24*/ @$undefined_var, @@ -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/math/tan_basic.phpt b/ext/standard/tests/math/tan_basic.phpt index b804a662de..e2934fb388 100644 --- a/ext/standard/tests/math/tan_basic.phpt +++ b/ext/standard/tests/math/tan_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input tan() precision = 14 --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); @@ -23,7 +23,7 @@ if (allowed_rounding_error(tan($sixty),1.7320508075689)) { else { echo "Fail\n"; } - + echo "tan 30 = "; var_dump(tan($thirty)); if (allowed_rounding_error(tan($thirty),0.57735026918963)) { diff --git a/ext/standard/tests/math/tan_basiclong_64bit.phpt b/ext/standard/tests/math/tan_basiclong_64bit.phpt index bdc97b0732..3c8abe9d27 100644 --- a/ext/standard/tests/math/tan_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tan_basiclong_64bit.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -25,7 +25,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(tan($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tan_error.phpt b/ext/standard/tests/math/tan_error.phpt index f36e633b16..b3d4cf83c1 100644 --- a/ext/standard/tests/math/tan_error.phpt +++ b/ext/standard/tests/math/tan_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tan() --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt index 81546bbf6f..b88d66acdf 100644 --- a/ext/standard/tests/math/tan_variation.phpt +++ b/ext/standard/tests/math/tan_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of tan() precision = 10 --FILE-- <?php -/* +/* * proto float tan(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test tan with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = tan($values[$i]); diff --git a/ext/standard/tests/math/tanh_basic.phpt b/ext/standard/tests/math/tanh_basic.phpt index 30eacca4cc..6b6a9dff7d 100644 --- a/ext/standard/tests/math/tanh_basic.phpt +++ b/ext/standard/tests/math/tanh_basic.phpt @@ -4,10 +4,10 @@ Test return type and value for expected input tanh() precision = 14 --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $file_path = dirname(__FILE__); require($file_path."/allowed_rounding_error.inc"); diff --git a/ext/standard/tests/math/tanh_basiclong_64bit.phpt b/ext/standard/tests/math/tanh_basiclong_64bit.phpt index f3563f81fc..02e6c102fe 100644 --- a/ext/standard/tests/math/tanh_basiclong_64bit.phpt +++ b/ext/standard/tests/math/tanh_basiclong_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php - + define("MAX_64Bit", 9223372036854775807); define("MAX_32Bit", 2147483647); define("MIN_64Bit", -9223372036854775807 - 1); @@ -23,7 +23,7 @@ foreach ($longVals as $longVal) { echo "--- testing: $longVal ---\n"; var_dump(tanh($longVal)); } - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/math/tanh_error.phpt b/ext/standard/tests/math/tanh_error.phpt index 1e38a6cdcf..cc92cb4aca 100644 --- a/ext/standard/tests/math/tanh_error.phpt +++ b/ext/standard/tests/math/tanh_error.phpt @@ -2,10 +2,10 @@ Test wrong number of arguments for tanh() --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ $arg_0 = 1.0; $extra_arg = 1; diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt index b1b477c150..0c9371e938 100644 --- a/ext/standard/tests/math/tanh_variation.phpt +++ b/ext/standard/tests/math/tanh_variation.phpt @@ -4,10 +4,10 @@ Test variations in usage of tanh() precision = 10 --FILE-- <?php -/* +/* * proto float tanh(float number) * Function is implemented in ext/standard/math.c -*/ +*/ //Test tanh with a different input values @@ -21,12 +21,12 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, true, - false); + false); for ($i = 0; $i < count($values); $i++) { $res = tanh($values[$i]); diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index c0468bcc40..69db7345a5 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_browser() function : basic functionality +Test get_browser() function : basic functionality --INI-- browscap={PWD}/browscap.ini --SKIPIF-- @@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; @@ -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_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt index 049c8b9431..d5e7abdd34 100644 --- a/ext/standard/tests/misc/get_browser_error.phpt +++ b/ext/standard/tests/misc/get_browser_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_browser() function : error functionality +Test get_browser() function : error functionality --INI-- browscap={PWD}/browscap.ini --SKIPIF-- @@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index 81164ac22d..6cc77e6765 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c - * Alias to functions: + * Alias to functions: */ $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc'; @@ -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/misc/time_nanosleep_error3.phpt b/ext/standard/tests/misc/time_nanosleep_error3.phpt index d10ef922d0..b6365f364f 100644 --- a/ext/standard/tests/misc/time_nanosleep_error3.phpt +++ b/ext/standard/tests/misc/time_nanosleep_error3.phpt @@ -1,7 +1,7 @@ --TEST-- time_nanosleep — Delay for a number of seconds and nanoseconds --SKIPIF-- -<?php +<?php if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die("skip Test is not valid for Windows"); if (!function_exists('time_nanosleep')) die("skip"); ?> diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt index cac7133e95..2be972a134 100644 --- a/ext/standard/tests/misc/time_sleep_until_basic.phpt +++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt @@ -19,7 +19,7 @@ Michele Orselli mo@ideato.it // to 10th of a second. this means there can be up to a .9 millisecond difference // which will fail this test. this test randomly fails on Windows and this is the cause. // - // fix: round to nearest millisecond + // fix: round to nearest millisecond // passes for up to .5 milliseconds less, fails for more than .5 milliseconds // should be fine since time_sleep_until() on Windows is accurate to the // millisecond(.5 rounded up is 1 millisecond) 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/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt index 77c7155ea8..06798a5c1d 100644 --- a/ext/standard/tests/network/closelog_basic.phpt +++ b/ext/standard/tests/network/closelog_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test closelog() function : basic functionality +Test closelog() function : basic functionality --FILE-- <?php /* Prototype : bool closelog(void) - * Description: Close connection to system logger + * Description: Close connection to system logger * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing closelog() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/closelog_error.phpt b/ext/standard/tests/network/closelog_error.phpt index b72048bd76..442f9a6249 100644 --- a/ext/standard/tests/network/closelog_error.phpt +++ b/ext/standard/tests/network/closelog_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test closelog() function : error conditions +Test closelog() function : error conditions --FILE-- <?php /* Prototype : bool closelog(void) - * Description: Close connection to system logger + * Description: Close connection to system logger * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing closelog() : error conditions ***\n"; diff --git a/ext/standard/tests/network/fsockopen_basic.phpt b/ext/standard/tests/network/fsockopen_basic.phpt index 4795008b5b..227762f899 100644 --- a/ext/standard/tests/network/fsockopen_basic.phpt +++ b/ext/standard/tests/network/fsockopen_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fsockopen() function : basic functionality +Test fsockopen() function : basic functionality --FILE-- <?php /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - * Description: Open Internet or Unix domain socket connection + * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing fsockopen() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt index 638412b47f..3b13b8cf39 100644 --- a/ext/standard/tests/network/fsockopen_error.phpt +++ b/ext/standard/tests/network/fsockopen_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fsockopen() function : error conditions +Test fsockopen() function : error conditions --FILE-- <?php /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - * Description: Open Internet or Unix domain socket connection + * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbyaddr_basic1.phpt b/ext/standard/tests/network/gethostbyaddr_basic1.phpt index 0e65937871..a20b4756c1 100644 --- a/ext/standard/tests/network/gethostbyaddr_basic1.phpt +++ b/ext/standard/tests/network/gethostbyaddr_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbyaddr() function : basic functionality +Test gethostbyaddr() function : basic functionality --FILE-- <?php /* Prototype : string gethostbyaddr ( string $ip_address ) - * Description: Get the Internet host name corresponding to a given IP address + * Description: Get the Internet host name corresponding to a given IP address * Source code: ext/standard/dns.c */ diff --git a/ext/standard/tests/network/gethostbyaddr_error.phpt b/ext/standard/tests/network/gethostbyaddr_error.phpt index f7982d5ca4..8909a30328 100644 --- a/ext/standard/tests/network/gethostbyaddr_error.phpt +++ b/ext/standard/tests/network/gethostbyaddr_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test gethostbyaddr() function : error conditions +Test gethostbyaddr() function : error conditions --FILE-- <?php /* Prototype : proto string gethostbyaddr(string ip_address) - * Description: Get the Internet host name corresponding to a given IP address + * Description: Get the Internet host name corresponding to a given IP address * Source code: ext/standard/dns.c - * Alias to functions: + * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbyname_basic003.phpt b/ext/standard/tests/network/gethostbyname_basic003.phpt index 2c6a6d3b21..2cb3d8d229 100644 --- a/ext/standard/tests/network/gethostbyname_basic003.phpt +++ b/ext/standard/tests/network/gethostbyname_basic003.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbyname() function : basic functionality +Test gethostbyname() function : basic functionality --FILE-- <?php /* Prototype : string gethostbyname ( string $hostname ) - * Description: Get the IPv4 address corresponding to a given Internet host name + * Description: Get the IPv4 address corresponding to a given Internet host name * Source code: ext/standard/dns.c */ 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/gethostbynamel_basic1.phpt b/ext/standard/tests/network/gethostbynamel_basic1.phpt index ceb2a843fd..9d1580c826 100644 --- a/ext/standard/tests/network/gethostbynamel_basic1.phpt +++ b/ext/standard/tests/network/gethostbynamel_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbynamel() function : basic functionality +Test gethostbynamel() function : basic functionality --FILE-- <?php /* Prototype : array gethostbynamel ( string $hostname ) - * Description: Get a list of IPv4 addresses corresponding to a given Internet host name + * Description: Get a list of IPv4 addresses corresponding to a given Internet host name * Source code: ext/standard/dns.c */ diff --git a/ext/standard/tests/network/gethostbynamel_error.phpt b/ext/standard/tests/network/gethostbynamel_error.phpt index 9d4c29619b..7aa00e537e 100644 --- a/ext/standard/tests/network/gethostbynamel_error.phpt +++ b/ext/standard/tests/network/gethostbynamel_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test gethostbynamel() function : error conditions +Test gethostbynamel() function : error conditions --FILE-- <?php /* Prototype : proto array gethostbynamel(string hostname) - * Description: Return a list of IP addresses that a given hostname resolves to. + * Description: Return a list of IP addresses that a given hostname resolves to. * Source code: ext/standard/dns.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing gethostbynamel() : error conditions ***\n"; 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..1bbcae4ef8 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -1,9 +1,9 @@ --TEST-- inet_ntop() & inet_pton() tests --SKIPIF-- -<?php -if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); -if (!function_exists("inet_pton")) die("skip no inet_pton()"); +<?php +if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); +if (!function_exists("inet_pton")) die("skip no inet_pton()"); ?> --FILE-- <?php @@ -37,39 +37,27 @@ foreach ($array as $val) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(9) "127.0.0.1" 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..488f267bf6 100644 --- a/ext/standard/tests/network/inet_ipv6.phpt +++ b/ext/standard/tests/network/inet_ipv6.phpt @@ -1,9 +1,9 @@ --TEST-- inet_ntop() & inet_pton() IPv6 tests --SKIPIF-- -<?php -if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); -if (!function_exists("inet_pton")) die("skip no inet_pton()"); +<?php +if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); +if (!function_exists("inet_pton")) die("skip no inet_pton()"); $packed = str_repeat(chr(0), 15) . chr(1); if (@inet_ntop($packed) === false) { @@ -33,16 +33,12 @@ foreach ($a as $address) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- string(3) "::1" 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..6c00824410 100644 --- a/ext/standard/tests/network/ip.phpt +++ b/ext/standard/tests/network/ip.phpt @@ -34,7 +34,7 @@ var_dump(long2ip(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) @@ -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/ip2long_error.phpt b/ext/standard/tests/network/ip2long_error.phpt index 4816d63943..65e7315595 100644 --- a/ext/standard/tests/network/ip2long_error.phpt +++ b/ext/standard/tests/network/ip2long_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ip2long() function : error conditions +Test ip2long() function : error conditions --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ip2long() : error conditions ***\n"; diff --git a/ext/standard/tests/network/ip2long_variation1.phpt b/ext/standard/tests/network/ip2long_variation1.phpt index fa7410930f..b228c9bd14 100644 --- a/ext/standard/tests/network/ip2long_variation1.phpt +++ b/ext/standard/tests/network/ip2long_variation1.phpt @@ -3,9 +3,9 @@ Test ip2long() function : usage variation 1 --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing ip2long() : usage variation ***\n"; @@ -94,7 +94,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource 'resource' => $res, ); diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index d85b6ba3c9..0ca156a67b 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -6,9 +6,9 @@ Test ip2long() function : usage variation 2, 32 bit --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ $ips = array( diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt index 7b93815f92..7dc726e8c2 100644 --- a/ext/standard/tests/network/ip_x86_64.phpt +++ b/ext/standard/tests/network/ip_x86_64.phpt @@ -34,7 +34,7 @@ var_dump(long2ip(array())); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(2130706433) string(9) "127.0.0.1" int(167772161) @@ -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_error.phpt b/ext/standard/tests/network/long2ip_error.phpt index 7003c36806..d56397cdd5 100644 --- a/ext/standard/tests/network/long2ip_error.phpt +++ b/ext/standard/tests/network/long2ip_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test long2ip() function : error conditions +Test long2ip() function : error conditions --FILE-- <?php /* Prototype : string long2ip(int proper_address) - * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format + * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing long2ip() : error conditions ***\n"; diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt index 488bea1222..6fc4f57ee4 100644 --- a/ext/standard/tests/network/long2ip_variation1.phpt +++ b/ext/standard/tests/network/long2ip_variation1.phpt @@ -1,16 +1,16 @@ --TEST-- -Test long2ip() function : usage variation +Test long2ip() function : usage variation --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip don't run on Windows"); -?> +?> --FILE-- <?php /* Prototype : string long2ip(int proper_address) - * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format + * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing long2ip() : usage variation ***\n"; @@ -97,9 +97,9 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - + // resource - 'resource' => $res, + 'resource' => $res, ); // loop through each element of the array for proper_address @@ -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..d9241d3de7 --- /dev/null +++ b/ext/standard/tests/network/setcookie_error.phpt @@ -0,0 +1,44 @@ +--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/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt index 1e79b059b1..1ce77fb80e 100644 --- a/ext/standard/tests/network/shutdown.phpt +++ b/ext/standard/tests/network/shutdown.phpt @@ -6,7 +6,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback ?> --FILE-- <?php - + for ($i=0; $i<100; $i++) { $port = rand(10000, 65000); /* Setup socket server */ @@ -15,7 +15,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback break; } } - + if (!$server) { die('Unable to create AF_INET socket [server]'); } diff --git a/ext/standard/tests/network/syslog_basic-win32.phpt b/ext/standard/tests/network/syslog_basic-win32.phpt index 8ad480a607..88d3c5a6d9 100644 --- a/ext/standard/tests/network/syslog_basic-win32.phpt +++ b/ext/standard/tests/network/syslog_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test syslog() function : basic functionality +Test syslog() function : basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") @@ -8,9 +8,9 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool syslog(int priority, string message) - * Description: Generate a system log message + * Description: Generate a system log message * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing syslog() : basic functionality ***\n"; diff --git a/ext/standard/tests/network/syslog_error.phpt b/ext/standard/tests/network/syslog_error.phpt index c958af432b..a99fd5314a 100644 --- a/ext/standard/tests/network/syslog_error.phpt +++ b/ext/standard/tests/network/syslog_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test syslog() function : error conditions +Test syslog() function : error conditions --FILE-- <?php /* Prototype : bool syslog(int priority, string message) - * Description: Generate a system log message + * Description: Generate a system log message * Source code: ext/standard/syslog.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing syslog() : error conditions ***\n"; diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt index c8223633ca..30b1d7bcd2 100644 --- a/ext/standard/tests/network/tcp6loop.phpt +++ b/ext/standard/tests/network/tcp6loop.phpt @@ -3,7 +3,7 @@ Streams Based IPv6 TCP Loopback test --SKIPIF-- <?php /* If IPv6 is supported on the platform this will error out with code 111 - Connection refused. - If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) + If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */ @stream_socket_client('tcp://[::1]:0', $errno); if ($errno != 111) die('skip IPv6 not supported.'); diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt index 61f8f25135..a61d082c18 100644 --- a/ext/standard/tests/network/udgloop.phpt +++ b/ext/standard/tests/network/udgloop.phpt @@ -3,7 +3,7 @@ Streams Based Unix Domain Datagram Loopback test --SKIPIF-- <?php # vim:ft=php: if (array_search("udg",stream_get_transports()) === false) - die('SKIP No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt index 83bfbb0667..abb103b0d1 100644 --- a/ext/standard/tests/network/unixloop.phpt +++ b/ext/standard/tests/network/unixloop.phpt @@ -3,7 +3,7 @@ Streams Based Unix Domain Loopback test --SKIPIF-- <?php # vim:ft=php: if (array_search("unix",stream_get_transports()) === false) - die('SKIP No support for UNIX domain sockets.'); + die('SKIP No support for UNIX domain sockets.'); ?> --FILE-- <?php diff --git a/ext/standard/tests/password/password_get_info_argon2.phpt b/ext/standard/tests/password/password_get_info_argon2.phpt index 0c9080f0a9..7caf6e6c69 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!
\ No newline at end of file diff --git a/ext/standard/tests/password/password_hash_argon2.phpt b/ext/standard/tests/password/password_hash_argon2.phpt index 29f7f28a95..a2cbdfacbd 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!
\ No newline at end of file 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 92c71e064b..c1968b2971 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 @@ -18,4 +22,13 @@ Warning: password_hash(): Time cost is outside of allowed time range in %s on li 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
\ No newline at end of file diff --git a/ext/standard/tests/password/password_needs_rehash_argon2.phpt b/ext/standard/tests/password/password_needs_rehash_argon2.phpt index 0b5fede1e3..de85a1d27b 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 @@ -12,6 +13,12 @@ var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I)); var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['memory_cost' => 1<<17])); var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['time_cost' => 4])); var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['threads' => 4])); + +$hash = password_hash('test', PASSWORD_ARGON2ID); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID)); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID, ['memory_cost' => 1<<17])); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID, ['time_cost' => 4])); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID, ['threads' => 4])); echo "OK!"; ?> --EXPECT-- @@ -19,4 +26,8 @@ bool(false) bool(true) bool(true) bool(true) -OK! +bool(false) +bool(true) +bool(true) +bool(true) +OK!
\ No newline at end of file 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 986f5e7005..f84df97286 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!
\ No newline at end of file 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/001.phpt b/ext/standard/tests/serialize/001.phpt index 5551956e92..e83b9af002 100644 --- a/ext/standard/tests/serialize/001.phpt +++ b/ext/standard/tests/serialize/001.phpt @@ -3,7 +3,7 @@ serialize()/unserialize()/var_dump() --INI-- serialize_precision=100 --FILE-- -<?php +<?php class t { function __construct() diff --git a/ext/standard/tests/serialize/002.phpt b/ext/standard/tests/serialize/002.phpt index 635e728968..3085d1cf4f 100644 --- a/ext/standard/tests/serialize/002.phpt +++ b/ext/standard/tests/serialize/002.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25378 (unserialize() crashes with invalid data) --FILE-- -<?php +<?php var_dump(unserialize('b:0;')); var_dump(unserialize('b:1;')); var_dump(unserialize('i:823;')); diff --git a/ext/standard/tests/serialize/003.phpt b/ext/standard/tests/serialize/003.phpt index 5011412809..edbcb1f0f0 100644 --- a/ext/standard/tests/serialize/003.phpt +++ b/ext/standard/tests/serialize/003.phpt @@ -4,7 +4,7 @@ unserialize() floats with E notation (#18654) precision=12 serialize_precision=100 --FILE-- -<?php +<?php foreach(array(1e2, 5.2e25, 85.29e-23, 9e-9) AS $value) { echo ($ser = serialize($value))."\n"; var_dump(unserialize($ser)); diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt index fc7d717229..5c0e8a0d13 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 @@ -48,17 +46,17 @@ class TestOld { echo __METHOD__ . "()\n"; } - + function unserialize($serialized) { echo __METHOD__ . "()\n"; } - + function __wakeup() { echo __METHOD__ . "()\n"; } - + function __sleep() { echo __METHOD__ . "()\n"; @@ -81,17 +79,17 @@ class TestNew implements Serializable return "2"; } } - + function unserialize($serialized) { echo __METHOD__ . "()\n"; } - + function __wakeup() { echo __METHOD__ . "()\n"; } - + function __sleep() { echo __METHOD__ . "()\n"; diff --git a/ext/standard/tests/serialize/006.phpt b/ext/standard/tests/serialize/006.phpt index 6ba93f4d23..fb813bc0d9 100644 --- a/ext/standard/tests/serialize/006.phpt +++ b/ext/standard/tests/serialize/006.phpt @@ -4,13 +4,13 @@ serialize()/unserialize() with exotic letters <?php $åäöÅÄÖ = array('åäöÅÄÖ' => 'åäöÅÄÖ'); - class ÜberKööliäå + class ÜberKööliäå { public $åäöÅÄÖüÜber = 'åäöÅÄÖ'; } - + $foo = new Überkööliäå(); - + var_dump(serialize($foo)); var_dump(unserialize(serialize($foo))); var_dump(serialize($åäöÅÄÖ)); diff --git a/ext/standard/tests/serialize/bug14293.phpt b/ext/standard/tests/serialize/bug14293.phpt index 73636ba56d..8e7b8a9d7d 100644 --- a/ext/standard/tests/serialize/bug14293.phpt +++ b/ext/standard/tests/serialize/bug14293.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #14293 (serialize() and __sleep()) --FILE-- -<?php +<?php class t { function __construct() @@ -13,7 +13,7 @@ class t { echo "__sleep called\n"; return array('a','b'); - } + } } $t = new t(); diff --git a/ext/standard/tests/serialize/bug21957.phpt b/ext/standard/tests/serialize/bug21957.phpt index 070eda3f4c..2084503d24 100644 --- a/ext/standard/tests/serialize/bug21957.phpt +++ b/ext/standard/tests/serialize/bug21957.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #21957 (serialize() mangles objects with __sleep) --FILE-- -<?php +<?php class test { public $a, $b; diff --git a/ext/standard/tests/serialize/bug23298.phpt b/ext/standard/tests/serialize/bug23298.phpt index fe56fccc45..a5305cf37c 100644 --- a/ext/standard/tests/serialize/bug23298.phpt +++ b/ext/standard/tests/serialize/bug23298.phpt @@ -3,7 +3,7 @@ Bug #23298 (serialize() and floats/doubles) --INI-- serialize_precision=100 --FILE-- -<?php +<?php ini_set('precision', 12); $foo = 1.428571428571428647642857142; $bar = unserialize(serialize($foo)); diff --git a/ext/standard/tests/serialize/bug24063.phpt b/ext/standard/tests/serialize/bug24063.phpt index 38c9d6ed24..3cca101cbb 100644 --- a/ext/standard/tests/serialize/bug24063.phpt +++ b/ext/standard/tests/serialize/bug24063.phpt @@ -4,7 +4,7 @@ Bug #24063 (serialize() missing 0 after the . on scientific notation) serialize_precision=100 precision=12 --FILE-- -<?php +<?php $v = 1; for ($i = 1; $i < 10; $i++) { $v /= 10; diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt index 70bfbb46a3..e95a427006 100644 --- a/ext/standard/tests/serialize/bug25378.phpt +++ b/ext/standard/tests/serialize/bug25378.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #25378 (unserialize() crashes with invalid data) --FILE-- -<?php +<?php var_dump(unserialize("s:-1:\"\";")); var_dump(unserialize("i:823")); var_dump(unserialize("O:8:\"stdClass :0:{}")); diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index b876874e40..74aeb46e80 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #26762 (unserialize() produces lowercase classnames) --SKIPIF-- -<?php +<?php if (class_exists('autoload_root')) die('skip Autoload test classes exist already'); ?> --FILE-- -<?php +<?php ini_set('unserialize_callback_func','check'); @@ -22,5 +22,5 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- string(3) "FOO" diff --git a/ext/standard/tests/serialize/bug30234.phpt b/ext/standard/tests/serialize/bug30234.phpt index 2111962294..ae3a0b2f55 100644 --- a/ext/standard/tests/serialize/bug30234.phpt +++ b/ext/standard/tests/serialize/bug30234.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #30234 (__autoload() not invoked for interfaces) --SKIPIF-- -<?php +<?php if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt index 566e959554..404d57eb3e 100644 --- a/ext/standard/tests/serialize/bug31402.phpt +++ b/ext/standard/tests/serialize/bug31402.phpt @@ -3,7 +3,7 @@ Bug #31402 (unserialize() generates references when it should not) --INI-- error_reporting=E_ALL --FILE-- -<?php +<?php class TestX { var $i; diff --git a/ext/standard/tests/serialize/bug49649.phpt b/ext/standard/tests/serialize/bug49649.phpt index d6acb80764..2e0a505930 100644 --- a/ext/standard/tests/serialize/bug49649.phpt +++ b/ext/standard/tests/serialize/bug49649.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pu *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug49649_1.phpt b/ext/standard/tests/serialize/bug49649_1.phpt index fb6d6dba52..1ca840a9b6 100644 --- a/ext/standard/tests/serialize/bug49649_1.phpt +++ b/ext/standard/tests/serialize/bug49649_1.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug49649_2.phpt b/ext/standard/tests/serialize/bug49649_2.phpt index fe5b43a6ad..e9fe4290de 100644 --- a/ext/standard/tests/serialize/bug49649_2.phpt +++ b/ext/standard/tests/serialize/bug49649_2.phpt @@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr *class Foo *{ * private $private = 1; - * + * * protected $protected = 2; - * + * * public $public = 3; - * + * * public $notThere = 'old'; * } * diff --git a/ext/standard/tests/serialize/bug62373.phpt b/ext/standard/tests/serialize/bug62373.phpt index 996e4c024c..666c33ebdb 100644 --- a/ext/standard/tests/serialize/bug62373.phpt +++ b/ext/standard/tests/serialize/bug62373.phpt @@ -14,7 +14,7 @@ for ($i = 0; $i < $period * 3; $i++) { $s = unserialize(serialize(array($b, $a))); if ($s[0] === $s[1]) { echo "OOPS\n"; - break; + break; } $dummy[] = $a; } diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt index 705b60dc05..ae6f0383d2 100644 --- a/ext/standard/tests/serialize/bug64354_1.phpt +++ b/ext/standard/tests/serialize/bug64354_1.phpt @@ -10,16 +10,16 @@ spl_autoload_register( try { var_dump(unserialize('O:1:"A":0:{}')); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"A":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { 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..a9a252d09a 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -16,9 +16,9 @@ spl_autoload_register( try { var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"B":0:{}}')); -} catch (Exception $e) { +} catch (Exception $e) { 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..c7eea59be5 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -21,9 +21,9 @@ $data = array(new A, new B); try { serialize($data); -} catch (Exception $e) { +} catch (Exception $e) { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt index c33155d269..e7250b37bc 100644 --- a/ext/standard/tests/serialize/bug68545.phpt +++ b/ext/standard/tests/serialize/bug68545.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor --FILE-- -<?php -var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); +<?php +var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); ?> ===DONE=== --EXPECTF-- 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..15bad692ed 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -14,7 +14,7 @@ $fakezval = pack( 0x00100000, 0x00000400, 0x00000000, - 0x00000006 + 0x00000006 ); $data = unserialize('a:2:{i:0;O:9:"evilClass":1:{s:4:"name";a:2:{i:0;i:1;i:1;i:2;}}i:1;R:4;}'); @@ -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/bug69425.phpt b/ext/standard/tests/serialize/bug69425.phpt index c7f4265789..e39f855f23 100644 --- a/ext/standard/tests/serialize/bug69425.phpt +++ b/ext/standard/tests/serialize/bug69425.phpt @@ -7,7 +7,7 @@ Bug #69425: Use After Free in unserialize() class test { var $ryat; - + function __wakeup() { $this->ryat = 1; 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..a002bdfbb0 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-- @@ -24,7 +28,7 @@ for ($i = 0; $i < 5; $i++) { $v[$i] = 'hi'.$i; } -var_dump($data); +var_dump($data); ?> --EXPECTF-- Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt index 1bbf3b98ab..8b0df73d60 100644 --- a/ext/standard/tests/serialize/bug70436.phpt +++ b/ext/standard/tests/serialize/bug70436.phpt @@ -6,12 +6,12 @@ Bug #70436: Use After Free Vulnerability in unserialize() class obj implements Serializable { var $data; - + function serialize() { return serialize($this->data); } - + function unserialize($data) { $this->data = unserialize($data); @@ -35,12 +35,12 @@ var_dump($data); function ptr2str($ptr) { $out = ''; - + for ($i = 0; $i < 8; $i++) { $out .= chr($ptr & 0xff); $ptr >>= 8; } - + return $out; } ?> diff --git a/ext/standard/tests/serialize/bug70513.phpt b/ext/standard/tests/serialize/bug70513.phpt index cbdbdb8222..2ac4ef6626 100644 --- a/ext/standard/tests/serialize/bug70513.phpt +++ b/ext/standard/tests/serialize/bug70513.phpt @@ -8,7 +8,7 @@ Bug #70513: GMP Deserialization Type Confusion Vulnerability class obj { var $ryat; - + function __wakeup() { $this->ryat = 1; 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..68727ad104 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -11,7 +11,7 @@ class C1 $this->arr1[0] = $this; $this->arr2[0] = $this->arr1[0]; $var1 = &$this->arr1[0]; // Set a reference... - unset($var1); // ... and unset it. + unset($var1); // ... and unset it. } } $Obj1 = new C1(); @@ -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/incomplete_class.phpt b/ext/standard/tests/serialize/incomplete_class.phpt index 948a31e166..7e6aa7b39f 100644 --- a/ext/standard/tests/serialize/incomplete_class.phpt +++ b/ext/standard/tests/serialize/incomplete_class.phpt @@ -13,7 +13,7 @@ var_dump($o->test2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- object(__PHP_Incomplete_Class)#%d (0) { } diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 4b9c7e2c3e..4b142344f9 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -3,16 +3,16 @@ Test serialize() & unserialize() functions: arrays (circular references) --INI-- serialize_precision=100 --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Circular reference of an array ---\n"; @@ -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 c9eded4a9a..b7348b969b 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -3,21 +3,21 @@ serialization: arrays with references amonst elements --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- No references:\n"; @@ -100,7 +100,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- No references: diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index 3e44d4c7e8..08f5ead4e5 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -3,21 +3,21 @@ serialization: arrays with references to an external variable --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- 0 refs external:\n"; @@ -70,7 +70,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 0 refs external: diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index bde60a4651..7ebacce98d 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -3,21 +3,21 @@ serialization: arrays with references to the containing array --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); var_dump($b); $b[0] = "b0.changed"; @@ -25,7 +25,7 @@ function check(&$a) { $b[1] = "b1.changed"; var_dump($b); $b[2] = "b2.changed"; - var_dump($b); + var_dump($b); } echo "\n\n--- 1 refs container:\n"; @@ -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..a22c04b8be 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -3,24 +3,24 @@ serialization: arrays with references, nested --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$a) { var_dump($a); $ser = serialize($a); var_dump($ser); - + $b = unserialize($ser); - - // Change each element and dump result. + + // Change each element and dump result. foreach($b as $k=>$v) { if (is_array($v)){ foreach($b[$k] as $sk=>$sv) { @@ -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_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt index 97c2af4ccb..014128b19f 100644 --- a/ext/standard/tests/serialize/serialization_error_001.phpt +++ b/ext/standard/tests/serialize/serialization_error_001.phpt @@ -1,16 +1,16 @@ --TEST-- -Test serialize() & unserialize() functions: error conditions - wrong number of args. +Test serialize() & unserialize() functions: error conditions - wrong number of args. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing serialize()/unserialize() : error conditions ***\n"; diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Binary files differindex e88e98e1b2..0d800d1516 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_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt Binary files differindex d887aba236..f85b89e102 100644 --- a/ext/standard/tests/serialize/serialization_objects_001.phpt +++ b/ext/standard/tests/serialize/serialization_objects_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt Binary files differindex c7f9e1cbd3..fbd9e26120 100644 --- a/ext/standard/tests/serialize/serialization_objects_002.phpt +++ b/ext/standard/tests/serialize/serialization_objects_002.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt index d72c471fae..5e6773a2ae 100644 --- a/ext/standard/tests/serialize/serialization_objects_003.phpt +++ b/ext/standard/tests/serialize/serialization_objects_003.phpt @@ -3,21 +3,21 @@ Test serialize() & unserialize() functions: objects (abstract classes) --INI-- serialize_precision=100 --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Abstract Class ---\n"; // abstract class -abstract class Name +abstract class Name { public function __construct() { $this->a = 10; @@ -27,10 +27,10 @@ abstract class Name abstract protected function getClassName(); public function printClassName () { return $this->getClassName(); - } + } } // implement abstract class -class extendName extends Name +class extendName extends Name { var $a, $b, $c; diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index f6a3ef6410..ec3713e844 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -1,16 +1,16 @@ --TEST-- -Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). +Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $x = new stdClass; @@ -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_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt index 4c631c6a59..fd58b0323a 100644 --- a/ext/standard/tests/serialize/serialization_objects_005.phpt +++ b/ext/standard/tests/serialize/serialization_objects_005.phpt @@ -3,14 +3,14 @@ Check behaviour of incomplete class --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $serialized = 'O:1:"C":1:{s:1:"p";i:1;}'; diff --git a/ext/standard/tests/serialize/serialization_objects_006.phpt b/ext/standard/tests/serialize/serialization_objects_006.phpt index 93fb726b4c..918e59d0aa 100644 --- a/ext/standard/tests/serialize/serialization_objects_006.phpt +++ b/ext/standard/tests/serialize/serialization_objects_006.phpt @@ -3,14 +3,14 @@ Behaviour of incomplete class is preserved even when it was not created by unser --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $a = new __PHP_Incomplete_Class; diff --git a/ext/standard/tests/serialize/serialization_objects_007.phpt b/ext/standard/tests/serialize/serialization_objects_007.phpt index ff584a0919..2837e1ec46 100644 --- a/ext/standard/tests/serialize/serialization_objects_007.phpt +++ b/ext/standard/tests/serialize/serialization_objects_007.phpt @@ -3,14 +3,14 @@ Ensure __autoload is called twice if unserialize_callback_func is defined. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ spl_autoload_register(function ($name) { @@ -20,7 +20,7 @@ spl_autoload_register(function ($name) { ini_set('unserialize_callback_func','check'); function check($name) { - echo "in check($name)\n"; + echo "in check($name)\n"; } $o = unserialize('O:3:"FOO":0:{}'); diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt index 484d38216d..b963872f28 100644 --- a/ext/standard/tests/serialize/serialization_objects_008.phpt +++ b/ext/standard/tests/serialize/serialization_objects_008.phpt @@ -1,16 +1,16 @@ --TEST-- Bad unserialize_callback_func --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ ini_set('unserialize_callback_func','Nonexistent'); diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt index 0c969df7cd..595692d2f0 100644 --- a/ext/standard/tests/serialize/serialization_objects_009.phpt +++ b/ext/standard/tests/serialize/serialization_objects_009.phpt @@ -3,14 +3,14 @@ Custom unserialization of classes with no custom unserializer. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ $ser = 'C:1:"C":6:{dasdas}'; diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index a663134ff7..9c7926a0d4 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -1,25 +1,23 @@ --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) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ Class C implements Serializable { - public function serialize() { + public function serialize() { return $this; } - + public function unserialize($blah) { } } @@ -32,6 +30,6 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- C::serialize() must return a string or NULL Done
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt index 09b3046d05..1dc48390c2 100644 --- a/ext/standard/tests/serialize/serialization_objects_011.phpt +++ b/ext/standard/tests/serialize/serialization_objects_011.phpt @@ -3,50 +3,50 @@ Object serialization / unserialization with inherited and hidden properties. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ Class A { private $APriv = "A.APriv"; protected $AProt = "A.AProt"; public $APub = "A.APub"; - + function audit() { - return isset($this->APriv, $this->AProt, $this->APub); - } + return isset($this->APriv, $this->AProt, $this->APub); + } } Class B extends A { private $BPriv = "B.BPriv"; protected $BProt = "B.BProt"; public $BPub = "B.BPub"; - + function audit() { return parent::audit() && isset($this->AProt, $this->APub, - $this->BPriv, $this->BProt, $this->BPub); - } + $this->BPriv, $this->BProt, $this->BPub); + } } Class C extends B { private $APriv = "C.APriv"; protected $AProt = "C.AProt"; public $APub = "C.APub"; - + private $CPriv = "C.CPriv"; protected $CProt = "C.BProt"; public $CPub = "C.CPub"; - + function audit() { - return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, - $this->BProt, $this->BPub, - $this->CPriv, $this->CProt, $this->CPub); + return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, + $this->BProt, $this->BPub, + $this->CPriv, $this->CProt, $this->CPub); } } @@ -58,11 +58,11 @@ function prettyPrint($obj) { $ser = serialize($obj); $serPrintable = str_replace("\0", '\0', $ser); var_dump($serPrintable); - + echo "Unserialized:\n"; $uobj = unserialize($ser); var_dump($uobj); - + echo "Sanity check: "; var_dump($uobj->audit()); } diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt index b834de3221..f994d8e260 100644 --- a/ext/standard/tests/serialize/serialization_objects_012.phpt +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt @@ -3,14 +3,14 @@ Object serialization / unserialization: real references and COW references --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n\nArray containing same object twice:\n"; @@ -20,7 +20,7 @@ $a[1] = $a[0]; var_dump($a); $ser = serialize($a); -var_dump($ser); +var_dump($ser); $ua = unserialize($ser); var_dump($ua); @@ -37,7 +37,7 @@ $a[1] = &$a[0]; var_dump($a); $ser = serialize($a); -var_dump($ser); +var_dump($ser); $ua = unserialize($ser); var_dump($ua); @@ -50,11 +50,11 @@ echo "\n\nObject containing same object twice:"; $obj = new stdclass; $contaner = new stdclass; $contaner->a = $obj; -$contaner->b = $contaner->a; +$contaner->b = $contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); @@ -68,11 +68,11 @@ echo "\n\nObject containing object and reference to that object:\n"; $obj = new stdclass; $contaner = new stdclass; $contaner->a = $obj; -$contaner->b = &$contaner->a; +$contaner->b = &$contaner->a; var_dump($contaner); $ser = serialize($contaner); -var_dump($ser); +var_dump($ser); $ucontainer = unserialize($ser); var_dump($ucontainer); diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 56e05c3756..c48be9ea79 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -1,25 +1,23 @@ --TEST-- -Object serialization / unserialization: references amongst properties ---INI-- -error_reporting = E_ALL & ~E_STRICT +Object serialization / unserialization: references amongst properties --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -27,7 +25,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs b:\n"; diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index b1e63b89fb..0b60413d25 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -1,25 +1,23 @@ --TEST-- -Object serialization / unserialization: references to external values ---INI-- -error_reporting = E_ALL & ~E_STRICT +Object serialization / unserialization: references to external values --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -27,7 +25,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs external:\n"; @@ -292,4 +290,4 @@ object(stdClass)#%d (3) { ["c"]=> &string(14) "obj->c.changed" } -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 69ac7f07ec..b47920e879 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 +Object serialization / unserialization: properties reference containing object --FILE-- <?php @@ -9,7 +7,7 @@ function check(&$obj) { var_dump($obj); $ser = serialize($obj); var_dump($ser); - + $uobj = unserialize($ser); var_dump($uobj); $uobj->a = "obj->a.changed"; @@ -17,7 +15,7 @@ function check(&$obj) { $uobj->b = "obj->b.changed"; var_dump($uobj); $uobj->c = "obj->c.changed"; - var_dump($uobj); + var_dump($uobj); } echo "\n\n--- a refs container:\n"; diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index 040ed5ec5b..0be0c68a89 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -5,17 +5,17 @@ serialize_precision=10 --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(6) "d:0.1;"
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index c94bc57318..91091e72a2 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -5,17 +5,17 @@ serialize_precision=75 --FILE-- <?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(60) "d:0.1000000000000000055511151231257827021181583404541015625;"
\ No newline at end of file diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt index 233b31ba64..dbb7d3d3e9 100644 --- a/ext/standard/tests/serialize/serialization_resources_001.phpt +++ b/ext/standard/tests/serialize/serialization_resources_001.phpt @@ -1,16 +1,16 @@ --TEST-- Test serialize() & unserialize() functions: resources --FILE-- -<?php +<?php /* Prototype : proto string serialize(mixed variable) - * Description: Returns a string representation of variable (which can later be unserialized) + * Description: Returns a string representation of variable (which can later be unserialized) * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c - * Alias to functions: + * Alias to functions: */ echo "\n--- Testing Resource ---\n"; 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/setrawcookie_basic_001.phpt b/ext/standard/tests/setrawcookie_basic_001.phpt new file mode 100644 index 0000000000..0cf36b635a --- /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/bug40459.phpt b/ext/standard/tests/streams/bug40459.phpt index ce06a3f804..902a1f9111 100644 --- a/ext/standard/tests/streams/bug40459.phpt +++ b/ext/standard/tests/streams/bug40459.phpt @@ -48,7 +48,7 @@ class testwrapper { echo $this->constructorCalled ? 'yes' : 'no'; return TRUE; } - function stream_metadata() + function stream_metadata() { echo $this->constructorCalled ? 'yes' : 'no'; return TRUE; diff --git a/ext/standard/tests/streams/bug44712.phpt b/ext/standard/tests/streams/bug44712.phpt index 9dfb26001b..ba783fdefc 100644 --- a/ext/standard/tests/streams/bug44712.phpt +++ b/ext/standard/tests/streams/bug44712.phpt @@ -6,5 +6,5 @@ $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..8aae912809 100644 --- a/ext/standard/tests/streams/bug46024.phpt +++ b/ext/standard/tests/streams/bug46024.phpt @@ -4,12 +4,12 @@ Bug #46024 stream_select() doesn't return the correct number <?php if (!getenv('TEST_PHP_EXECUTABLE')) die("skip TEST_PHP_EXECUTABLE not defined"); ?> --FILE-- <?php -$php = realpath(getenv('TEST_PHP_EXECUTABLE')); +$php = realpath(getenv('TEST_PHP_EXECUTABLE')); $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/bug60455_02.phpt b/ext/standard/tests/streams/bug60455_02.phpt index c68a1a07ab..0ddf346eba 100644 --- a/ext/standard/tests/streams/bug60455_02.phpt +++ b/ext/standard/tests/streams/bug60455_02.phpt @@ -10,13 +10,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt index 131da852b7..2429d31008 100644 --- a/ext/standard/tests/streams/bug60455_03.phpt +++ b/ext/standard/tests/streams/bug60455_03.phpt @@ -22,7 +22,7 @@ class TestStream { function stream_eof() { return $this->s >= $this->eofth; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60455_04.phpt b/ext/standard/tests/streams/bug60455_04.phpt index 123a8653d3..3a82298dbc 100644 --- a/ext/standard/tests/streams/bug60455_04.phpt +++ b/ext/standard/tests/streams/bug60455_04.phpt @@ -11,13 +11,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\n"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index 82917ecbd6..f0a3cf83e8 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', $environment); if (is_resource($p)) { $data = ''; - while (1) { + while (1) { $w = $e = NULL; $n = stream_select($pipes, $w, $e, 300); diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt index 7fead5362f..45b207ea9e 100644 --- a/ext/standard/tests/streams/bug61019.phpt +++ b/ext/standard/tests/streams/bug61019.phpt @@ -23,17 +23,17 @@ if(is_resource($process)) $stdin_stream=""; $stderr_stream=""; - echo "External command executed\n"; - do + echo "External command executed\n"; + do { $process_state=proc_get_status($process); - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -42,13 +42,13 @@ if(is_resource($process)) echo "External command exit: ".$process_state['exitcode']."\n"; //read outstanding data - $tmp_stdin=stream_get_contents($pipes[1]); - if($tmp_stdin) + $tmp_stdin=stream_get_contents($pipes[1]); + if($tmp_stdin) { $stdin_stream=$stdin_stream.$tmp_stdin; } $tmp_stderr=stream_get_contents($pipes[2]); - if($tmp_stderr) + if($tmp_stderr) { $stderr_stream=$stderr_stream.$tmp_stderr; } @@ -57,7 +57,7 @@ if(is_resource($process)) fclose ($pipes[1]); fclose ($pipes[2]); - proc_close($process); + proc_close($process); echo "STDOUT: ".$stdin_stream."\n"; echo "STDERR: ".$stderr_stream."\n"; diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 892b0f80e5..99e2f7929c 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/ext/standard/tests/streams/bug61115-1.phpt @@ -5,7 +5,7 @@ Bug #61115: Stream related segfault on fatal error in php_stream_context_del_lin if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); } -?> +?> --FILE-- <?php diff --git a/ext/standard/tests/streams/bug64166_2.phpt b/ext/standard/tests/streams/bug64166_2.phpt index b4224662ee..9d6655d5c1 100644 --- a/ext/standard/tests/streams/bug64166_2.phpt +++ b/ext/standard/tests/streams/bug64166_2.phpt @@ -13,7 +13,7 @@ function test_64166($data) { 'line-length' => 74 )); $str = ""; - while(($c = fread($fd, 1))!= "") $str .= $c; + while(($c = fread($fd, 1))!= "") $str .= $c; var_dump($str); stream_filter_remove($res); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index 67c66d61bc..f973768f81 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -2,7 +2,7 @@ Bug #60180 ($_SERVER["PHP_SELF"] incorrect) --SKIPIF-- <?php -if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc")) +if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc")) die("skip could not found cli server script"); $res = @include dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc"; if(!$res) { @@ -27,7 +27,7 @@ foreach($codes as $code) { echo "follow=0\n"; $arr = array('http'=> array( - 'follow_location'=>0, + 'follow_location'=>0, ) ); $context = stream_context_create($arr); @@ -37,7 +37,7 @@ foreach($codes as $code) { echo "follow=1\n"; $arr = array('http'=> array( - 'follow_location'=>1, + 'follow_location'=>1, ) ); $context = stream_context_create($arr); diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt index 86addfd809..24817e620f 100644 --- a/ext/standard/tests/streams/bug64770.phpt +++ b/ext/standard/tests/streams/bug64770.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64770 stream_select() fails with pipes from proc_open() +Bug #64770 stream_select() fails with pipes from proc_open() --FILE-- <?php @@ -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); @@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts); if (is_resource($p)) { $data = ''; - while (1) { + while (1) { $w = $e = NULL; $n = stream_select($pipes, $w, $e, 300); diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index ffdfb3553b..fefe6c1f0a 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -5,18 +5,18 @@ Bug #67626: Exceptions not properly handled in user stream handlers class MyStream { public function stream_open() { return true; } - + public function stream_read() { throw new Exception('stream_read_exception'); return 'read'; } - + public function stream_eof() { return true; } - + public function stream_write() { throw new Exception('stream_write_exception'); @@ -40,6 +40,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- stream_read_exception stream_write_exception
\ No newline at end of file diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index cc3f328d3f..fd02b8c0bc 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -7,7 +7,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php -/* What is checked here is +/* What is checked here is - start a server and listen - as soon as client connects, close connection and exit - on the client side - sleep(1) and check feof() @@ -55,7 +55,7 @@ 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/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt index ebb358707e..b38ccbdda8 100644 --- a/ext/standard/tests/streams/bug72771.phpt +++ b/ext/standard/tests/streams/bug72771.phpt @@ -16,7 +16,7 @@ $path="ftps://127.0.0.1:" . $port."/"; $ds=opendir($path, $context); var_dump($ds); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d bool(false) 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/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt index e91e6fa4ea..97d145b595 100644 --- a/ext/standard/tests/streams/bug72857.phpt +++ b/ext/standard/tests/streams/bug72857.phpt @@ -8,7 +8,7 @@ Bug #72857 stream_socket_recvfrom read access violation $v3=STREAM_PEEK; $v4="A"; - var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); + var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); fclose($fp0); unlink($fname); diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index a49a2026b7..f44c26d8a6 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -16,7 +16,7 @@ $path="ftp://127.0.0.1:" . $port."/bug73457"; $ds=file_get_contents($path); var_dump($ds); ?> -==DONE== +==DONE== --EXPECTF-- Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d 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..f0d67a3524 --- /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/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index d2d2ce8b9c..28fa43cf26 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -14,7 +14,7 @@ $path="ftp://localhost:" . $port."/bogusdir"; var_dump(opendir($path)); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-002.phpt b/ext/standard/tests/streams/opendir-002.phpt index a995979992..83d40e8bb1 100644 --- a/ext/standard/tests/streams/opendir-002.phpt +++ b/ext/standard/tests/streams/opendir-002.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -21,7 +21,7 @@ while ($fn=readdir($ds)) { closedir($ds); ?> -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 2b3aedbf30..1d6a9057fa 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -18,7 +18,7 @@ $context = stream_context_create(array('ssl' => array('cafile' => __DIR__ . '/. var_dump(opendir($path, $context)); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-004.phpt b/ext/standard/tests/streams/opendir-004.phpt index 06a3f944be..b50c6580c2 100644 --- a/ext/standard/tests/streams/opendir-004.phpt +++ b/ext/standard/tests/streams/opendir-004.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -22,7 +22,7 @@ while ($fn=readdir($ds)) { var_dump($fn); } ?> -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt index 4587f0718e..08cc7a2147 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 747f1171f3..ac7c72036d 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/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index 8049fb68ff..a3fdfa6c55 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -33,7 +33,7 @@ for($i = 0; $i < 10; $i++){ $s = fgets($pipes[1]); $t1 = microtime(1); - echo $s; + echo $s; echo "fgets() took ", (($t1 - $t0)*1000 > $max_ms ? 'more' : 'less'), " than $max_ms ms\n"; } diff --git a/ext/standard/tests/streams/set_file_buffer.phpt b/ext/standard/tests/streams/set_file_buffer.phpt index 79df5a441a..04d0fb121d 100644 --- a/ext/standard/tests/streams/set_file_buffer.phpt +++ b/ext/standard/tests/streams/set_file_buffer.phpt @@ -10,16 +10,16 @@ class test_wrapper { function stream_open($path, $mode, $openedpath) { return true; } - + function stream_eof() { return false; } - + function stream_write($data) { echo "size: ", strlen($data), "\n"; return strlen($data); } - + function stream_set_option($option, $arg1, $arg2) { echo "option: ", $option, ", ", $arg1, ", ", $arg2, "\n"; return false; diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt index 1e5b7e31d8..401c65bce0 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt @@ -16,7 +16,7 @@ $ctxt = stream_context_create([ $stream = stream_socket_client( "tcp://www.php.net:80", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $ctxt); -$socket = +$socket = socket_import_stream($stream); var_dump(socket_get_option($socket, SOL_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt index 3f4fc48667..bf35925e4d 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt @@ -15,7 +15,7 @@ $ctxt = stream_context_create([ $stream = fopen("http://www.php.net", "r", false, $ctxt); -$socket = +$socket = @socket_import_stream($stream); var_dump(socket_get_option($socket, STREAM_IPPROTO_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt index ed7f7fb0ac..6606a15052 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt @@ -38,7 +38,7 @@ $clientCode = <<<'CODE' CODE; include sprintf( - "%s/../../../openssl/tests/ServerClientTestCase.inc", + "%s/../../../openssl/tests/ServerClientTestCase.inc", dirname(__FILE__)); ServerClientTestCase::getInstance()->run($serverCode, $clientCode); ?> diff --git a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt index 8cdd5c1779..32756d7618 100644 --- a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt +++ b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt @@ -10,13 +10,13 @@ class TestStream { function stream_read($count) { if ($this->s++ == 0) return "a\0"; - + return ""; } function stream_eof() { return $this->s >= 2; } - + } stream_wrapper_register("test", "TestStream"); 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..a133ef1e08 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 @@ -1,9 +1,9 @@ --TEST-- -Test stream_get_meta_data() function : error conditions +Test stream_get_meta_data() function : error conditions --FILE-- <?php /* Prototype : proto array stream_get_meta_data(resource fp) - * Description: Retrieves header/meta data from streams/file pointers + * Description: Retrieves header/meta data from streams/file pointers * Source code: ext/standard/streamsfuncs.c * Alias to functions: socket_get_status */ @@ -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_meta_data_file_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt index f7ccc7783b..d54eb04410 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt @@ -16,7 +16,7 @@ fclose($fp); // open file in each access mode and get meta data foreach ($filemodes as $mode) { if (strncmp($mode, 'x', 1) == 0) { - // x modes require that file does not exist + // x modes require that file does not exist unlink($filename); } $fp = fopen($filename, $mode); diff --git a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt index 02a6ae8cc8..b7ab37c7c5 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt @@ -2,8 +2,8 @@ Testing stream_get_meta_data() on a process stream. --FILE-- <?php - -$output_file = __FILE__.'.tmp'; + +$output_file = __FILE__.'.tmp'; $cmd = "echo here is some output"; $mode = 'rb'; $handle = popen($cmd, $mode); 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 ce272519c4..cd0ad07234 100644 --- a/ext/standard/tests/streams/stream_set_chunk_size.phpt +++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt @@ -89,5 +89,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..63c9a8df42 100644 --- a/ext/standard/tests/streams/stream_set_timeout_error.phpt +++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test stream_set_timeout() function : error conditions +Test stream_set_timeout() function : error conditions --FILE-- <?php /* Prototype : proto bool stream_set_timeout(resource stream, int seconds, int microseconds) - * Description: Set timeout on stream read to seconds + microseonds + * Description: Set timeout on stream read to seconds + microseonds * Source code: ext/standard/streamsfuncs.c * Alias to functions: socket_set_timeout */ @@ -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_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt index 4b0d9a1923..3e1aedcd82 100644 --- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt +++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt @@ -19,7 +19,7 @@ if (is_resource($sock)) { var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT)); - var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)); + var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_SERVER)); var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_SERVER)); 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/stream_socket_sendto.phpt b/ext/standard/tests/streams/stream_socket_sendto.phpt index 62d9f6ef80..73515a7434 100644 --- a/ext/standard/tests/streams/stream_socket_sendto.phpt +++ b/ext/standard/tests/streams/stream_socket_sendto.phpt @@ -27,32 +27,32 @@ if (is_resource($sock)) { } ?> --EXPECTF-- -Notice: fwrite(): send of %i bytes failed with errno=%i Broken pipe in %s on line %i +Notice: fwrite(): send of %i bytes failed with errno=%i Broken pipe in %s on line %d -Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %i +Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %d bool(%s) -Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %i +Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %d bool(%s) Warning: stream_socket_sendto(): Broken pipe - in %s on line %i + in %s on line %d int(%i) Warning: stream_socket_sendto(): Broken pipe - in %s on line %i + in %s on line %d int(%i) -Warning: stream_socket_sendto(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %i +Warning: stream_socket_sendto(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d -Warning: stream_socket_sendto(): Failed to resolve %s: php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %i +Warning: stream_socket_sendto(): Failed to resolve %s: php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d -Warning: stream_socket_sendto(): Failed to parse %s into a valid network address in %s on line %i +Warning: stream_socket_sendto(): Failed to parse %s into a valid network address in %s on line %d bool(%s) -Warning: stream_socket_sendto(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %i +Warning: stream_socket_sendto(): php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d -Warning: stream_socket_sendto(): Failed to resolve %s: php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %i +Warning: stream_socket_sendto(): Failed to resolve %s: php_network_getaddresses: getaddrinfo failed: Name or service not known in %s on line %d -Warning: stream_socket_sendto(): Failed to parse %s into a valid network address in %s on line %i +Warning: stream_socket_sendto(): Failed to parse %s into a valid network address in %s on line %d bool(%s) diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt index 147a7bd0a7..ebfa1f095d 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/004.phpt b/ext/standard/tests/strings/004.phpt index 9a0ea18861..e1414db46c 100644 --- a/ext/standard/tests/strings/004.phpt +++ b/ext/standard/tests/strings/004.phpt @@ -15,7 +15,7 @@ for ($i = 0; $i < $times; $i++) { $p = range(1,4); shuffle($p); $s = join('', $p); - if (empty($a[$s])) $a[$s] = 0; + if (empty($a[$s])) $a[$s] = 0; $a[$s]++; } diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt index 41ec9dc92f..ebfbe221d8 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/006.phpt b/ext/standard/tests/strings/006.phpt index 7665aa20f5..afb5d24dbf 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -12,7 +12,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index 7d06f018a5..b16c566eaa 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index a0fd8acdf4..804b455167 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -13,7 +13,7 @@ var_dump(ob_get_contents()); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt Binary files differindex 4080c7214d..c9722c7fe7 100644 --- a/ext/standard/tests/strings/addcslashes_001.phpt +++ b/ext/standard/tests/strings/addcslashes_001.phpt diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index 09327706b9..fa5b3028fb 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -21,10 +21,10 @@ class string1 $obj = new string1; var_dump( addcslashes($obj, "b") ); -echo "Done\n"; +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..7c97adfa2d 100644 --- a/ext/standard/tests/strings/addcslashes_003.phpt +++ b/ext/standard/tests/strings/addcslashes_003.phpt diff --git a/ext/standard/tests/strings/addcslashes_004.phpt b/ext/standard/tests/strings/addcslashes_004.phpt index a787845506..db2b6f8858 100644 --- a/ext/standard/tests/strings/addcslashes_004.phpt +++ b/ext/standard/tests/strings/addcslashes_004.phpt @@ -13,7 +13,7 @@ var_dump( addcslashes() ); var_dump( addcslashes("foo[]") ); var_dump( addcslashes('foo[]', "o", "foo") ); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index 7d5f6f0a48..eeb5627067 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test addslashes() function : basic functionality +Test addslashes() function : basic functionality --FILE-- <?php /* Prototype : string addslashes ( string $str ) - * Description: Returns a string with backslashes before characters (single quotes, double quote, + * Description: Returns a string with backslashes before characters (single quotes, double quote, * backslash and nul character) that need to be quoted in database queries etc. * Source code: ext/standard/string.c */ /* - * Testing addslashes() with strings containing characters that can be prefixed with backslash + * Testing addslashes() with strings containing characters that can be prefixed with backslash * by the function */ @@ -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/addslashes_error.phpt b/ext/standard/tests/strings/addslashes_error.phpt index c5d67c09ae..e920dfd1c4 100644 --- a/ext/standard/tests/strings/addslashes_error.phpt +++ b/ext/standard/tests/strings/addslashes_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test addslashes() function : error conditions +Test addslashes() function : error conditions --FILE-- <?php /* Prototype : string addslashes ( string $str ) diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt index e204498ba6..6dfeb7e69b 100644 --- a/ext/standard/tests/strings/addslashes_variation1.phpt +++ b/ext/standard/tests/strings/addslashes_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test addslashes() function : usage variations - non-string type argument +Test addslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string addslashes ( string $str ) @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - non-string type argument */ /* - * Test addslashes() with non-string type argument such as int, float, etc + * Test addslashes() with non-string type argument such as int, float, etc */ echo "*** Testing addslashes() : with non-string type argument ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -36,43 +36,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + /*25*/ NULL, null ); diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt index 628980df27..792c2c30b6 100644 --- a/ext/standard/tests/strings/addslashes_variation2.phpt +++ b/ext/standard/tests/strings/addslashes_variation2.phpt @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - strings with characters to be ba */ /* - * Test addslashes() with various strings containing characters thats can be backslashed + * Test addslashes() with various strings containing characters thats can be backslashed */ echo "*** Testing addslashes() : with various strings containing characters to be backslashed ***\n"; @@ -21,21 +21,21 @@ EOT; $heredoc_null_string =<<<EOT EOT; - + // initialising the string array -$str_array = array( +$str_array = array( // string without any characters that can be backslashed 'Hello world', - + // string with single quotes - "how're you doing?", + "how're you doing?", "don't disturb u'r neighbours", "don't disturb u'r neighbours''", '', '\'', "'", - + // string with double quotes 'he said, "he will be on leave"', 'he said, ""he will be on leave"', @@ -44,7 +44,7 @@ $str_array = array( "\"", '"', "hello\"", - + // string with backslash characters 'Is your name Ram\Krishna?', '\\0.0.0.0', diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt Binary files differindex 4793aca5ec..31299276b3 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_error.phpt b/ext/standard/tests/strings/basename_error.phpt index 8309c3578b..bd7741d0e9 100644 --- a/ext/standard/tests/strings/basename_error.phpt +++ b/ext/standard/tests/strings/basename_error.phpt @@ -4,17 +4,17 @@ Test basename() function : error conditions <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ echo "*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( basename() ); // more than expected no. of arguments var_dump( basename("/var/tmp/bar.gz", ".gz", ".gz") ); -// passing invalid type arguments +// passing invalid type arguments $object = new stdclass; var_dump( basename( array("string/bar") ) ); var_dump( basename( array("string/bar"), "bar" ) ); diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index db0130c2a2..8928fa1aeb 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) == "WIN")) <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ @@ -17,6 +17,6 @@ var_dump(basename(chr(-1))); echo "Done\n"; ---EXPECTF-- +--EXPECT-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_invalid_path_win.phpt b/ext/standard/tests/strings/basename_invalid_path_win.phpt index 3cb74c21ed..587f2b114c 100644 --- a/ext/standard/tests/strings/basename_invalid_path_win.phpt +++ b/ext/standard/tests/strings/basename_invalid_path_win.phpt @@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) != "WIN")) <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index 2be0aad5ee..a0e8ebc744 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -4,7 +4,7 @@ Test basename() function : usage variations <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ $file_path_variations = array ( @@ -62,7 +62,7 @@ $file_path_variations = array ( /* path with spaces */ array(" "), array(' '), - + /* empty paths */ array(""), array(''), @@ -76,8 +76,8 @@ function check_basename( $path_arrays ) { if( 1 == count($path) ) { // no suffix provided var_dump( basename($path[0]) ); } else { // path as well as suffix provided, - var_dump( basename($path[0], $path[1]) ); - } + var_dump( basename($path[0], $path[1]) ); + } } } @@ -86,7 +86,7 @@ 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/bin2hex_basic.phpt b/ext/standard/tests/strings/bin2hex_basic.phpt index 9eb07b573e..5d667a7ff6 100644 --- a/ext/standard/tests/strings/bin2hex_basic.phpt +++ b/ext/standard/tests/strings/bin2hex_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bin2hex() function : basic functionality +Test bin2hex() function : basic functionality --FILE-- <?php @@ -17,20 +17,20 @@ $strings = array ( /*1*/ "Here is a simple string", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings /*4*/ 'Here is a simple string', '\t This String contains \t\t some control characters\r\n', '\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f', -); +); // loop through with each element of the $strings array to test bin2hex() function $count = 1; foreach($strings as $string) { - echo "-- Iteration $count --\n"; + echo "-- Iteration $count --\n"; var_dump(bin2hex($string)); $count ++; -} +} ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/bin2hex_error.phpt b/ext/standard/tests/strings/bin2hex_error.phpt index efee90bdee..9d2e1313a1 100644 --- a/ext/standard/tests/strings/bin2hex_error.phpt +++ b/ext/standard/tests/strings/bin2hex_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bin2hex() function : error conditions +Test bin2hex() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing bin2hex() function with more than expected no. of arguments - $extra_arg = 10; var_dump( bin2hex("Hello World", $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing bin2hex() : error conditions *** @@ -31,4 +31,5 @@ NULL Warning: bin2hex() expects exactly 1 parameter, 2 given in %s on line %d NULL + ===DONE=== diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt index 2b8513879c..e73ff5de6a 100644 --- a/ext/standard/tests/strings/bin2hex_variation1.phpt +++ b/ext/standard/tests/strings/bin2hex_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( /*1*/ 0, 1, 123456, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/true, false, TRUE, FALSE, - + // null values /*14*/NULL, null, - + // objects /*16*/new sample(), - + // resource /*17*/$file_handle, - + // undefined variable /*18*/@$undefined_var, - + // unset variable /*19*/@$unset_var ); 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/bug22207.phpt b/ext/standard/tests/strings/bug22207.phpt index 956acd2103..32a15d73cd 100644 --- a/ext/standard/tests/strings/bug22207.phpt +++ b/ext/standard/tests/strings/bug22207.phpt @@ -2,7 +2,7 @@ Bug #22207 (missing 0 when using the e notation in *printf functions) --FILE-- <?php - printf("%10.5e\n", 1.1); + printf("%10.5e\n", 1.1); var_dump(sprintf("%10.5e\n", 1.1)); ?> --EXPECT-- diff --git a/ext/standard/tests/strings/bug22224.phpt b/ext/standard/tests/strings/bug22224.phpt index 0ab00a6c42..c30f222f32 100644 --- a/ext/standard/tests/strings/bug22224.phpt +++ b/ext/standard/tests/strings/bug22224.phpt @@ -14,7 +14,7 @@ class foo $a = new foo(); - + $arr = array(0=>&$a, 1=>&$a); var_dump(implode(",",$arr)); var_dump($arr) diff --git a/ext/standard/tests/strings/bug26817.phpt b/ext/standard/tests/strings/bug26817.phpt index 2e31d30be9..228348708c 100644 --- a/ext/standard/tests/strings/bug26817.phpt +++ b/ext/standard/tests/strings/bug26817.phpt @@ -2,7 +2,7 @@ Bug #26817 (http_build_query() did not handle private & protected object properties) --FILE-- <?php -class test { +class test { protected $foo; private $bar; public $test; diff --git a/ext/standard/tests/strings/bug33076.phpt b/ext/standard/tests/strings/bug33076.phpt index 95525ff2e8..dafb8161b0 100644 --- a/ext/standard/tests/strings/bug33076.phpt +++ b/ext/standard/tests/strings/bug33076.phpt @@ -9,6 +9,6 @@ var_dump($value); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(6) "bzexbz" Done diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt index 3c52250718..6317c974ab 100644 --- a/ext/standard/tests/strings/bug36306.phpt +++ b/ext/standard/tests/strings/bug36306.phpt @@ -6,7 +6,7 @@ Bug #36306 (crc32() 64bit) /* as an example how to write crc32 tests PHP does not have uint values, you cannot display crc32 like a signed integer. - Have to find some small strings to truly reproduce + Have to find some small strings to truly reproduce the problem, this example being not a problem */ echo dechex(crc32("platform independent")) . "\n"; diff --git a/ext/standard/tests/strings/bug36944.phpt b/ext/standard/tests/strings/bug36944.phpt index a9f117fe3f..2a43d060e2 100644 --- a/ext/standard/tests/strings/bug36944.phpt +++ b/ext/standard/tests/strings/bug36944.phpt @@ -13,7 +13,7 @@ var_dump(strncasecmp("test ", "E", 0)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Length must be greater than or equal to 0 in %s on line %d bool(false) int(%d) diff --git a/ext/standard/tests/strings/bug37262.phpt b/ext/standard/tests/strings/bug37262.phpt index b964c4a659..ffdc994f46 100644 --- a/ext/standard/tests/strings/bug37262.phpt +++ b/ext/standard/tests/strings/bug37262.phpt @@ -5,6 +5,6 @@ Bug #37262 (var_export() does not escape \0 character) $func = create_function('$a', 'return $a;'); var_export($func); ?> ---EXPECTF-- +--EXPECTF-- Deprecated: Function create_function() is deprecated in %s on line %d '' . "\0" . 'lambda_%d' diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index d0a44a0902..fd7165894c 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/bug38770.phpt b/ext/standard/tests/strings/bug38770.phpt index 76ec33572b..1821639aca 100644 --- a/ext/standard/tests/strings/bug38770.phpt +++ b/ext/standard/tests/strings/bug38770.phpt @@ -13,7 +13,7 @@ foreach (array('N','l') as $v) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Array ( [1] => 4294937296 diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index ac8bdba411..1628b9df7d 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/bug39350.phpt b/ext/standard/tests/strings/bug39350.phpt index 8cc51e9592..53d58b7099 100644 --- a/ext/standard/tests/strings/bug39350.phpt +++ b/ext/standard/tests/strings/bug39350.phpt @@ -9,5 +9,5 @@ implode('', array("")); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt Binary files differindex 924544f2e1..f1973eeaf4 100644 --- a/ext/standard/tests/strings/bug39621.phpt +++ b/ext/standard/tests/strings/bug39621.phpt diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt index 527b7d3c92..e73f3c8516 100644 --- a/ext/standard/tests/strings/bug39873.phpt +++ b/ext/standard/tests/strings/bug39873.phpt @@ -9,7 +9,7 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO --FILE-- <?php setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO_8859-1"); - $num = 0+"1234.56"; + $num = 0+"1234.56"; echo number_format($num,2); echo "\n"; ?> diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index d6b56918ff..bdd5a0f816 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/bug40704.phpt b/ext/standard/tests/strings/bug40704.phpt index b2f6cf89cc..82e91b5c87 100644 --- a/ext/standard/tests/strings/bug40704.phpt +++ b/ext/standard/tests/strings/bug40704.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(26) "Bug ' Trigger Missing Text" Done diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt index 26ea5bc770..b30042e939 100644 --- a/ext/standard/tests/strings/bug40754.phpt +++ b/ext/standard/tests/strings/bug40754.phpt @@ -26,7 +26,7 @@ var_dump(chunk_split("abcde", $v, "abc")); var_dump(substr("abcde", $v, $v)); ?> ---EXPECTF-- +--EXPECTF-- string(4) "bcde" string(6) "abcdex" bool(false) 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/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt index eb32e739e0..60449e04f0 100644 --- a/ext/standard/tests/strings/bug45166.phpt +++ b/ext/standard/tests/strings/bug45166.phpt @@ -2,7 +2,7 @@ Bug #45166 (substr() ) --FILE-- <?php - echo substr('cd', -3) . "\n"; + echo substr('cd', -3) . "\n"; ?> ===DONE=== --EXPECT-- 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/bug48709.phpt b/ext/standard/tests/strings/bug48709.phpt index 6a93b8dae4..999a2c6513 100644 --- a/ext/standard/tests/strings/bug48709.phpt +++ b/ext/standard/tests/strings/bug48709.phpt @@ -13,8 +13,8 @@ $exceptions = array( 'x', // s 'wh', // w 'wa' // w -); - +); + foreach ($exceptions as $letter) { printf("%s => %s\n", $letter, metaphone($letter)); } 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/bug54721.phpt b/ext/standard/tests/strings/bug54721.phpt index f21d65fddf..3851df1542 100644 --- a/ext/standard/tests/strings/bug54721.phpt +++ b/ext/standard/tests/strings/bug54721.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size) --FILE-- -<?php +<?php echo crypt("", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; echo crypt("b", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; echo crypt("bu", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n"; diff --git a/ext/standard/tests/strings/bug55871.phpt b/ext/standard/tests/strings/bug55871.phpt index 0c8fd4c6e6..0044f50ce7 100644 --- a/ext/standard/tests/strings/bug55871.phpt +++ b/ext/standard/tests/strings/bug55871.phpt @@ -17,7 +17,7 @@ class test2 { } class test3 { - public function __toString() { + public function __toString() { $GLOBALS['my_var'] .= "AAAAAAAA"; return ''; } diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt index 7131fc2449..ac19ce6a04 100644 --- a/ext/standard/tests/strings/bug64879.phpt +++ b/ext/standard/tests/strings/bug64879.phpt @@ -3,10 +3,10 @@ Bug #64879: quoted_printable_encode() wrong size calculation (CVE-2013-2110) --FILE-- <?php -quoted_printable_encode(str_repeat("\xf4", 1000)); -quoted_printable_encode(str_repeat("\xf4", 100000)); +quoted_printable_encode(str_repeat("\xf4", 1000)); +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 9ae18c0890..c92e558c49 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-- @@ -11,7 +11,7 @@ date.timezone=Europe/Berlin --FILE-- <?php -function test($locale, $value) +function test($locale, $value) { $newlocale = setlocale(LC_ALL, $locale); $conv = localeconv(); diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index 18bcb86b76..2656a1b7f1 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -9,9 +9,9 @@ $filename = 'test.toto'; $csv = base64_decode('6Q=='); $adata = str_getcsv($csv,";"); $b2 = basename($filename); -if ($filename != $b2) +if ($filename != $b2) print "BUG"; -else +else print "OKEY"; ---EXPECTF-- +--EXPECT-- OKEY diff --git a/ext/standard/tests/strings/bug67252.phpt b/ext/standard/tests/strings/bug67252.phpt index 576524f1d2..80a6ebcf1c 100644 --- a/ext/standard/tests/strings/bug67252.phpt +++ b/ext/standard/tests/strings/bug67252.phpt @@ -7,7 +7,7 @@ $a = "M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A"."\n"."a."; var_dump(convert_uudecode($a)); ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) 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 1d1e5a15f5..f769616f56 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/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt Binary files differindex ea6944e6da..7b68ca28d0 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_error.phpt b/ext/standard/tests/strings/chop_error.phpt index 2f2656f3aa..71a1004ecd 100644 --- a/ext/standard/tests/strings/chop_error.phpt +++ b/ext/standard/tests/strings/chop_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chop() function : error conditions +Test chop() function : error conditions --FILE-- <?php /* Prototype : string chop ( string $str [, string $charlist] ) diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt index 3a680c216f..13e735d02e 100644 --- a/ext/standard/tests/strings/chop_variation1.phpt +++ b/ext/standard/tests/strings/chop_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chop() function : usage variations - unexpected values for str argument +Test chop() function : usage variations - unexpected values for str argument --FILE-- <?php /* Prototype : string chop ( string $str [, string $charlist] ) @@ -63,7 +63,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -72,10 +72,10 @@ $values = array ( // unset variable $unset_var, - + // object $sample_obj, - + // resource $file_handle ); diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt index cad8ec75f5..02d32306ec 100644 --- a/ext/standard/tests/strings/chop_variation2.phpt +++ b/ext/standard/tests/strings/chop_variation2.phpt @@ -71,13 +71,13 @@ $values = array ( // resource $file_handle, - + // undefined variable $undefined_var, // unset variable $unset_var - + ); 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 cd269dfa58..2d67ed06e1 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..bce4184d42 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chr() function : basic functionality +Test chr() function : basic functionality --FILE-- <?php @@ -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_ord.phpt b/ext/standard/tests/strings/chr_ord.phpt Binary files differindex be0b1a32da..b5015a0108 100644 --- a/ext/standard/tests/strings/chr_ord.phpt +++ b/ext/standard/tests/strings/chr_ord.phpt diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index e61ed54699..3da03316c9 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( 1, 255, 256, - + // float values /*5*/ 10.5, -20.5, 1.1234e6, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); @@ -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..da4720a187 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test chunk_split() function : basic functionality +Test chunk_split() function : basic functionality --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) - * Description: Returns split line + * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* -* Testing chunk_split() for basic functionality by passing all possible -* arguments as well as with default arguments chunklen and ending +* Testing chunk_split() for basic functionality by passing all possible +* arguments as well as with default arguments chunklen and ending */ echo "*** Testing chunk_split() : basic functionality ***\n"; @@ -22,7 +22,7 @@ $chunklen = 2; $ending = '##'; // Calling chunk_split() with all possible arguments -echo "-- Testing chunk_split() with all possible arguments --\n"; +echo "-- Testing chunk_split() with all possible arguments --\n"; var_dump( chunk_split($str, $chunklen, $ending) ); @@ -34,10 +34,10 @@ var_dump( chunk_split($str, $chunklen) ); //Calling chunk_split() with default chunklen and ending string echo "-- Testing chunk_split() with default chunklen and ending string --\n"; var_dump( chunk_split($str) ); - -echo "Done" + +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_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt index d8a72586af..341f04ffd3 100644 --- a/ext/standard/tests/strings/chunk_split_error.phpt +++ b/ext/standard/tests/strings/chunk_split_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : error conditions +Test chunk_split() function : error conditions --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) @@ -9,8 +9,8 @@ Test chunk_split() function : error conditions */ /* -* Testing error conditions of chunk_split() with zero arguments -* and for more than expected number of arguments +* Testing error conditions of chunk_split() with zero arguments +* and for more than expected number of arguments */ echo "*** Testing chunk_split() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/chunk_split_variation1.phpt b/ext/standard/tests/strings/chunk_split_variation1.phpt index 0b24f9b6d9..5f41c86dc3 100644 --- a/ext/standard/tests/strings/chunk_split_variation1.phpt +++ b/ext/standard/tests/strings/chunk_split_variation1.phpt @@ -81,7 +81,7 @@ $values = array( @$unset_var, // resource data - $fp + $fp ); // loop through each element of the array for 'str' diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt index 5bf678b4ac..99bb623c33 100644 --- a/ext/standard/tests/strings/chunk_split_variation10.phpt +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt @@ -28,12 +28,12 @@ $values = array ( 'ENDING', //String '@#$%^', //Special chars - - '\t', + + '\t', '\n', '\r', '\r\n', - + '\0', //Null char '123', //Numeric '(MSG)', //With ( and ) @@ -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..c08a0c3d88 100644 --- a/ext/standard/tests/strings/chunk_split_variation11.phpt +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - different strings for 'ending' /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: none + * Alias to functions: none */ /* @@ -26,7 +26,7 @@ $chunklen = 6E+0; //different values for 'ending' $values = array ( - "", //empty + "", //empty " ", //space "a", //single char "ENDING", //regular string @@ -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..6a025f1abb 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument +Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) @@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings for ' */ /* -* passing different heredoc strings as 'ending' argument to chunk_split() +* passing different heredoc strings as 'ending' argument to chunk_split() * 'chunklen' argument is set to 10 */ @@ -80,10 +80,10 @@ foreach($heredoc_arr as $value) { var_dump( chunk_split( $str, $chunklen, $value) ); $count++; }; - + 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..38b8f9568a 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - default 'chunklen' with long st /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..195e2d2605 100644 --- a/ext/standard/tests/strings/chunk_split_variation2.phpt +++ b/ext/standard/tests/strings/chunk_split_variation2.phpt @@ -40,7 +40,7 @@ $values = array( (float) PHP_INT_MAX + 1, (float) -PHP_INT_MAX - 1, .5, - + // array data array(), array(0), @@ -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_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt index 408d8c8afb..758bec088b 100644 --- a/ext/standard/tests/strings/chunk_split_variation3.phpt +++ b/ext/standard/tests/strings/chunk_split_variation3.phpt @@ -75,7 +75,7 @@ $values = array( // unset data @$unset_var, - + // resource data $fp ); diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index f5c926c7a0..9f9a8b75ba 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : usage variations - different heredoc strings as 'str' argument +Test chunk_split() function : usage variations - different heredoc strings as 'str' argument --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) @@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings as 's */ /* -* Passing different heredoc strings as 'str' argument to the chunk_split() +* Passing different heredoc strings as 'str' argument to the chunk_split() * with 'chunklen' 4 and default value of 'ending' that is "\r\n" */ @@ -81,10 +81,10 @@ foreach($heredoc_arr as $str) { var_dump( chunk_split( $str, $chunklen) ); $count++; }; - + 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..332aecdb96 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 4242a81a9b..ccfc08a569 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -23,19 +23,19 @@ $ending = "):("; $values = array( '', //empty ' ', //space - 'This is simple string', //regular string - 'It\'s string with quotes', - 'This contains @ # $ % ^ & chars', //special characters - 'This string\tcontains\rwhite space\nchars', //with white space chars - 'This is string with 1234 numbers', - 'This is string with \0 and ".chr(0)."null chars', //for binary safe - 'This is string with multiple space char', - 'This is to check string with ()', - ' Testing with multiple spaces ', - 'Testing invalid \k and \m escape char', - 'This is to check with \\n and \\t' -); - + 'This is simple string', //regular string + 'It\'s string with quotes', + 'This contains @ # $ % ^ & chars', //special characters + 'This string\tcontains\rwhite space\nchars', //with white space chars + 'This is string with 1234 numbers', + 'This is string with \0 and ".chr(0)."null chars', //for binary safe + 'This is string with multiple space char', + 'This is to check string with ()', + ' Testing with multiple spaces ', + 'Testing invalid \k and \m escape char', + 'This is to check with \\n and \\t' +); + //Loop through each element of values for 'str' for($count = 0;$count < count($values);$count++) { @@ -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..0cd3bec922 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..e97b1e9036 100644 --- a/ext/standard/tests/strings/chunk_split_variation8.phpt +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* @@ -31,8 +31,8 @@ $ending = ':::'; // different values for 'chunklen' $values = array ( - 0, - 1, + 0, + 1, -123, //negative integer 0234, //octal number 0x1A, //hexadecimal number @@ -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..c7989b0539 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.phpt b/ext/standard/tests/strings/convert_cyr_string.phpt index af239543c5..b62768eff4 100644 --- a/ext/standard/tests/strings/convert_cyr_string.phpt +++ b/ext/standard/tests/strings/convert_cyr_string.phpt @@ -19,7 +19,7 @@ var_dump(convert_cyr_string("", "d", "i")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e5ccf4cbb9..e38fb3f639 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_cyr_string() function : basic functionality +Test convert_cyr_string() function : basic functionality --FILE-- <?php @@ -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_cyr_string_error.phpt b/ext/standard/tests/strings/convert_cyr_string_error.phpt index 66effea430..844f2d74d8 100644 --- a/ext/standard/tests/strings/convert_cyr_string_error.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_cyr_string() function : error conditions +Test convert_cyr_string() function : error conditions --FILE-- <?php @@ -33,7 +33,7 @@ var_dump(bin2hex( convert_cyr_string($str, $from, "?")) ); echo "\n-- Testing convert_cyr_string() function with invalid 'from' and 'to' character set --\n"; var_dump(bin2hex( convert_cyr_string($str, ">", "?")) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_cyr_string() : error conditions *** @@ -69,4 +69,5 @@ Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d string(10) "68656c6c6f" -===DONE=== + +===DONE===
\ No newline at end of file diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt index 47174defef..9986ac214d 100644 --- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 34e53cbdda..1d7e373512 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : basic functionality +Test convert_uudecode() function : basic functionality --FILE-- <?php @@ -20,35 +20,35 @@ $strings = array ( "Here is a simple string to test convert_uuencode/decode", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings '123', 'abc', '1a2b3c', '\t This String contains \t\t some control characters\r\n', - -); + +); // loop through with each element of the $strings array to test convert_uudecode() function $count = 1; foreach($strings as $string) { - + $encode = convert_uuencode($string); $decode = convert_uudecode($encode); - - if ($decode != $string) { - var_dump($encode, $decode, $string); + + if ($decode != $string) { + var_dump($encode, $decode, $string); exit("TEST FAILED on iteration $count\n"); - } - + } + $count ++; } echo "TEST PASSED\n"; ?> -===DONE=== ---EXPECTF-- +===DONE=== +--EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED ===DONE=== diff --git a/ext/standard/tests/strings/convert_uudecode_error.phpt b/ext/standard/tests/strings/convert_uudecode_error.phpt index 77ac18b50b..77d3a88833 100644 --- a/ext/standard/tests/strings/convert_uudecode_error.phpt +++ b/ext/standard/tests/strings/convert_uudecode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : error conditions +Test convert_uudecode() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing convert_uudecode() function with more than expected no. of ar $extra_arg = 10; var_dump( convert_uudecode(72, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_uudecode() : error conditions *** @@ -31,4 +31,5 @@ bool(false) Warning: convert_uudecode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) + ===DONE=== diff --git a/ext/standard/tests/strings/convert_uudecode_variation1.phpt b/ext/standard/tests/strings/convert_uudecode_variation1.phpt index 4c66f076a5..049fd7f65b 100644 --- a/ext/standard/tests/strings/convert_uudecode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uudecode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index b8c338a1c6..9849997d41 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : basic functionality +Test convert_uuencode() function : basic functionality --FILE-- <?php @@ -20,14 +20,14 @@ $strings = array ( "Here is a simple string to test convert_uuencode/decode", "\t This String contains \t\t some control characters\r\n", "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f", - + //single quoted strings '123', 'abc', '1a2b3c', '\t This String contains \t\t some control characters\r\n', - -); + +); // loop through with each element of the $strings array to test convert_uuencode() function $count = 1; @@ -39,7 +39,7 @@ foreach($strings as $string) { ?> -===DONE=== +===DONE=== --EXPECTF-- *** Testing convert_uuencode() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/convert_uuencode_error.phpt b/ext/standard/tests/strings/convert_uuencode_error.phpt index ec4d3f6477..a995e18fe2 100644 --- a/ext/standard/tests/strings/convert_uuencode_error.phpt +++ b/ext/standard/tests/strings/convert_uuencode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : error conditions +Test convert_uuencode() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing convert_uuencode() function with more than expected no. of ar $extra_arg = 10; var_dump( convert_uuencode(72, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_uuencode() : error conditions *** @@ -31,4 +31,5 @@ bool(false) Warning: convert_uuencode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) + ===DONE=== diff --git a/ext/standard/tests/strings/convert_uuencode_variation1.phpt b/ext/standard/tests/strings/convert_uuencode_variation1.phpt index c9ef4335be..12ca281960 100644 --- a/ext/standard/tests/strings/convert_uuencode_variation1.phpt +++ b/ext/standard/tests/strings/convert_uuencode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index 587beea95b..f74496214a 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test count_chars() function : basic functionality +Test count_chars() function : basic functionality --FILE-- <?php @@ -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_error.phpt b/ext/standard/tests/strings/count_chars_error.phpt index f87b6e532e..45c1163398 100644 --- a/ext/standard/tests/strings/count_chars_error.phpt +++ b/ext/standard/tests/strings/count_chars_error.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing count_chars() function with no arguments --\n"; var_dump( count_chars() ); echo "\n-- Testing count_chars() function with more than expected no. of arguments --\n"; -$string = "Hello World\n"; +$string = "Hello World\n"; $mode = 1; $extra_arg = 10; var_dump( count_chars($string, $mode, $extra_arg) ); diff --git a/ext/standard/tests/strings/count_chars_variation1.phpt b/ext/standard/tests/strings/count_chars_variation1.phpt index 9e78219dbe..18e23f95b6 100644 --- a/ext/standard/tests/strings/count_chars_variation1.phpt +++ b/ext/standard/tests/strings/count_chars_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /* 7 */ 10.5, -20.5, 10.1234567e10, - + // array values /* 10 */ array(), array(0), array(1, 2), - + // boolean values /* 13 */ true, false, TRUE, FALSE, - + // null values /* 17 */ NULL, null, - + // objects /* 19 */ new sample(), - + // resource /* 20 */ $file_handle, - + // undefined variable /* 21 */ @$undefined_var, - + // unset variable /* 22 */ @$unset_var ); diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt index d1ce781933..fb3305bbbd 100644 --- a/ext/standard/tests/strings/count_chars_variation2.phpt +++ b/ext/standard/tests/strings/count_chars_variation2.phpt @@ -29,40 +29,40 @@ $inputs = array ( 255, 2147483647, -2147483648, - + // float values /* 6 */ 0.0, 1.3, 10.5, -20.5, 10.1234567e10, - + // array values /* 11 */ array(), array(1, 2, 3, 4, 5, 6, 7, 8, 9), - + // boolean values /* 14 */ true, false, TRUE, FALSE, - + // null values /* 18 */ NULL, null, - + // string values /* 20 */ "ABCD", 'abcd', "1ABC", "5ABC", - + // objects /* 24 */ new sample(), - + // undefined variable /* 25 */ @$undefined_var, - + // unset variable /* 26 */ @$unset_var ); @@ -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 9c3ea44594..2ddc2f9618 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -1,15 +1,9 @@ --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) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ @@ -34,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 e8b708d97f..71798ed002 100644 --- a/ext/standard/tests/strings/crc32_error.phpt +++ b/ext/standard/tests/strings/crc32_error.phpt @@ -1,15 +1,9 @@ --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) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt index 1d6f33ec2e..cfd4779091 100644 --- a/ext/standard/tests/strings/crc32_variation1.phpt +++ b/ext/standard/tests/strings/crc32_variation1.phpt @@ -2,14 +2,14 @@ Test crc32() function : usage variations - unexpected values --SKIPIF-- <?php -if (PHP_INT_SIZE != 4) +if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index ed2eb6b719..7473194f1b 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ @@ -63,7 +63,7 @@ $string_array = array( // looping to check the behaviour of the function for each string in the array -$count = 1; +$count = 1; foreach($string_array as $str) { echo "\n-- Iteration $count --\n"; var_dump( crc32($str) ); @@ -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_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index 691703103e..639254a5f4 100644 --- a/ext/standard/tests/strings/crc32_variation3.phpt +++ b/ext/standard/tests/strings/crc32_variation3.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ @@ -65,7 +65,7 @@ $string_array = array( // looping to check the behaviour of the function for each string in the array -$count = 1; +$count = 1; foreach($string_array as $str) { echo "\n-- Iteration $count --\n"; var_dump( crc32($str) ); diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt index d3349d2092..00b47dc190 100644 --- a/ext/standard/tests/strings/crc32_variation4.phpt +++ b/ext/standard/tests/strings/crc32_variation4.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ @@ -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 cbddd236de..5374197e20 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,6 +53,6 @@ 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 4015cf34fb..ffbc5747de 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,6 +54,6 @@ 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/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt index 9006b27619..33fee611e0 100644 --- a/ext/standard/tests/strings/dirname_basic.phpt +++ b/ext/standard/tests/strings/dirname_basic.phpt @@ -16,18 +16,18 @@ $file_paths = array ( "/foo/bar/", "foo/bar/", "/bar/", - + /* path with only files and trailing slashes*/ "/foo/bar.gz", "foo/bar.gz", "bar.gz", "bar.gz/", - "/bar.gz", + "/bar.gz", "/bar.gz/", "/foo/bar.gz/", "foo/bar.gz/", - "/bar.gz/", - + "/bar.gz/", + /* path with file extension and trailing slashes */ "/.gz", ".gz", @@ -49,7 +49,7 @@ function check_dirname( $paths ) { $noOfPaths = count($paths); for( ; $loop_counter < $noOfPaths; $loop_counter++ ) { echo "\n--Iteration "; - echo $loop_counter + 1; + echo $loop_counter + 1; echo " --\n"; var_dump( dirname($paths[$loop_counter]) ); } diff --git a/ext/standard/tests/strings/dirname_error.phpt b/ext/standard/tests/strings/dirname_error.phpt index 98a9ea5b45..303a59b2d5 100644 --- a/ext/standard/tests/strings/dirname_error.phpt +++ b/ext/standard/tests/strings/dirname_error.phpt @@ -6,7 +6,7 @@ Test dirname() function : error conditions Description: Returns directory name component of path. */ echo "*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( dirname() ); // Bad arg diff --git a/ext/standard/tests/strings/dirname_variation.phpt b/ext/standard/tests/strings/dirname_variation.phpt index 71a2e4db2e..da66f0fc55 100644 --- a/ext/standard/tests/strings/dirname_variation.phpt +++ b/ext/standard/tests/strings/dirname_variation.phpt @@ -6,7 +6,7 @@ Test dirname() function : usage variations Description: Returns directory name component of path. */ class temp -{ +{ function __toString() { return "Object"; } @@ -26,7 +26,7 @@ $file_path_variations = array ( "hostname:/home/user/My Pics.gz/", "hostname:/home/user/My Pics/", "hostname:/home/user/My Pics", - + /* path containing numeric string */ "10.5", "/10.5", @@ -35,7 +35,7 @@ $file_path_variations = array ( "10/10.gz", '0', "0", - + /* object */ new temp, @@ -56,7 +56,7 @@ function check_dirname( $paths ) { for( ; $loop_counter < $noOfPaths; $loop_counter++ ) { echo "\n--Iteration "; echo $loop_counter +1; - echo " --\n"; + echo " --\n"; var_dump( dirname($paths[$loop_counter]) ); } } diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt index 4c7a3fe45a..20c2a25470 100644 --- a/ext/standard/tests/strings/explode.phpt +++ b/ext/standard/tests/strings/explode.phpt @@ -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/explode1.phpt b/ext/standard/tests/strings/explode1.phpt index 6842947605..669b66272d 100644 --- a/ext/standard/tests/strings/explode1.phpt +++ b/ext/standard/tests/strings/explode1.phpt @@ -6,9 +6,9 @@ precision=14 --FILE-- <?php /* Prototype: array explode ( string $delimiter, string $string [, int $limit] ); - Description: Returns an array of strings, each of which is a substring of string + Description: Returns an array of strings, each of which is a substring of string formed by splitting it on boundaries formed by the string delimiter. - If limit is set, the returned array will contain a maximum of limit + If limit is set, the returned array will contain a maximum of limit elements with the last element containing the rest of string. */ @@ -28,7 +28,7 @@ $delimiters = array ( ); $string = "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"; /* loop prints an array of strings, each of which is a substring of $string - formed by splitting it on boundaries formed by the string $delimiter. + formed by splitting it on boundaries formed by the string $delimiter. */ $counter = 1; foreach($delimiters as $delimiter) { @@ -51,7 +51,7 @@ echo "\n-- Passing limit values 0 and 1 to explode() --\n"; var_dump( explode(":", "Name:Phone:Address:City:State", 0) ); var_dump( explode(":", "Name:Phone:Address:City:State", 1) ); -/* to check the maximum limit of string that can be given with limit<=0, +/* to check the maximum limit of string that can be given with limit<=0, default size is 50 but increases dynamically */ echo "\n*** Testing explode() for maximum limit of string with Limit = -1 ***\n"; var_dump( explode(":", "1:2:3:4:5:6:7:7:5:6:7:3:4:5:2:8:9:0:5:5:5:5:5:5:5:5:5:5:5:5:55:5:5:5%:%:%:%:5:5:5:%:%:5:5:5:5:5%:%:%:55:1:1", -1) ); 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_variation1.phpt b/ext/standard/tests/strings/explode_variation1.phpt index 7ced1dc822..f16f69bece 100644 --- a/ext/standard/tests/strings/explode_variation1.phpt +++ b/ext/standard/tests/strings/explode_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $delimiters = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/explode_variation2.phpt b/ext/standard/tests/strings/explode_variation2.phpt index 9377f30842..4de4637ac1 100644 --- a/ext/standard/tests/strings/explode_variation2.phpt +++ b/ext/standard/tests/strings/explode_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $strings = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt index d60d26bec6..b139058844 100644 --- a/ext/standard/tests/strings/explode_variation3.phpt +++ b/ext/standard/tests/strings/explode_variation3.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $limits = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); @@ -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/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt index 14b6d401a2..d1b34e3ef8 100644 --- a/ext/standard/tests/strings/explode_variation6.phpt +++ b/ext/standard/tests/strings/explode_variation6.phpt @@ -33,10 +33,10 @@ $e = test_explode("\x00", $str, 100); function test_explode($delim, $string, $limit) { $e = explode($delim, $string, $limit); - foreach ( $e as $v) + foreach ( $e as $v) { var_dump(bin2hex($v)); - } + } } ?> ===DONE=== 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..7ff0aa9a41 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -17,14 +17,14 @@ asort( $tt ); var_dump( $tt ); echo "-- with table = HTML_SPECIALCHARS --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "WINDOWS-1252"); asort( $tt ); 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_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt index 86f19f3a66..e60443050d 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt index 1715b0852b..52ba2f44f3 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt @@ -25,7 +25,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "Windows-1251 var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "Windows-1251"); uksort( $tt, 'so' ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt index 4e5c5afc14..98ebbb9ac4 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XHTML, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt index a3813262f7..8f8ca580ea 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt @@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XML1, "UTF-8"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt index 6e144c0c51..cd32cccd5f 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt @@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "SJIS"); var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "SJIS"); asort( $tt ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_error.phpt b/ext/standard/tests/strings/get_html_translation_table_error.phpt index 5adfe98478..149adbc197 100644 --- a/ext/standard/tests/strings/get_html_translation_table_error.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_html_translation_table() function : error conditions +Test get_html_translation_table() function : error conditions --FILE-- <?php /* Prototype : array get_html_translation_table ( [int $table [, int $quote_style [, string charset_hint]]] ) 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..a20d10c654 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -8,7 +8,7 @@ Test get_html_translation_table() function : usage variations - unexpected table */ /* - * test get_html_translation_table() with unexpected value for argument $table + * test get_html_translation_table() with unexpected value for argument $table */ echo "*** Testing get_html_translation_table() : usage variations ***\n"; @@ -19,7 +19,7 @@ $quote_style = ENT_COMPAT; $unset_var = 10; unset($unset_var); -// a resource variable +// a resource variable $fp = fopen(__FILE__, "r"); // array with different values @@ -49,7 +49,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -81,7 +81,7 @@ for($index = 0; $index < count($values); $index ++) { } else { var_dump($v); } - + $v = get_html_translation_table($table, $quote_style, "UTF-8"); if (is_array($v) && count($v) > 100) var_dump(count($v)); @@ -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..907eda35ae 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt @@ -52,12 +52,12 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, // resource var - $fp, + $fp, // undefined variable @$undefined_var, @@ -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..1fb9bf41a1 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..5cdd86ca36 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrev() function : basic functionality +Test hebrev() function : basic functionality --FILE-- <?php @@ -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_error.phpt b/ext/standard/tests/strings/hebrev_error.phpt index a04e519db5..8abf68cd70 100644 --- a/ext/standard/tests/strings/hebrev_error.phpt +++ b/ext/standard/tests/strings/hebrev_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrev() function : error conditions +Test hebrev() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing hebrev() function with more than expected no. of arguments -- $extra_arg = 10; var_dump( hebrev("Hello World", 5, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing hebrev() : error conditions *** @@ -31,4 +31,5 @@ NULL Warning: hebrev() expects at most 2 parameters, 3 given in %s on line %d NULL -===DONE=== + +===DONE===
\ No newline at end of file diff --git a/ext/standard/tests/strings/hebrev_variation1.phpt b/ext/standard/tests/strings/hebrev_variation1.phpt index 33fd974eb7..23a4c23145 100644 --- a/ext/standard/tests/strings/hebrev_variation1.phpt +++ b/ext/standard/tests/strings/hebrev_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var, diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt index 2c72588b42..a577d1ee89 100644 --- a/ext/standard/tests/strings/hebrev_variation2.phpt +++ b/ext/standard/tests/strings/hebrev_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); @@ -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..2eaa6d712c 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrevc() function : basic functionality +Test hebrevc() function : basic functionality --FILE-- <?php @@ -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_error.phpt b/ext/standard/tests/strings/hebrevc_error.phpt index 630c995b18..f75abb3a4d 100644 --- a/ext/standard/tests/strings/hebrevc_error.phpt +++ b/ext/standard/tests/strings/hebrevc_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrevc() function : error conditions +Test hebrevc() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing hebrevc() function with more than expected no. of arguments - $extra_arg = 10; var_dump( hebrevc("Hello World", 5, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing hebrevc() : error conditions *** @@ -31,4 +31,5 @@ NULL Warning: hebrevc() expects at most 2 parameters, 3 given in %s on line %d NULL + ===DONE=== diff --git a/ext/standard/tests/strings/hebrevc_variation1.phpt b/ext/standard/tests/strings/hebrevc_variation1.phpt index c16780e769..92c6ffabb9 100644 --- a/ext/standard/tests/strings/hebrevc_variation1.phpt +++ b/ext/standard/tests/strings/hebrevc_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $texts = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt index 33c331b94c..75ebc30cd8 100644 --- a/ext/standard/tests/strings/hebrevc_variation2.phpt +++ b/ext/standard/tests/strings/hebrevc_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,43 +34,43 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e5, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abc", 'abc', "3abc", "0abc", "0x3", - + // objects /*24*/ new sample(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); @@ -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/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 65636908e6..d1a0323c58 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -36,7 +36,7 @@ var_dump(highlight_file($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt index 18f6f3c90b..76323be30b 100644 --- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt +++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'CP866'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt index 09fd5df02b..a3be8f3668 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt index 070ed536f4..6a65413c9c 100644 --- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt +++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt @@ -106,7 +106,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt index e8523f6a09..cb7fc7d1d8 100644 --- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt +++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt @@ -138,7 +138,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt index 4f500dc4e7..4691bcf1a7 100644 --- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt +++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt index e60d7074bf..e47392623c 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt @@ -142,7 +142,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt index 6163ef24ae..2a7a6981dc 100644 --- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt +++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt @@ -62,7 +62,7 @@ foreach ($arr as $u => $v) { $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); $d = unpack("H*", $res); echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]); - + $ent = sprintf("&#x%X;", $v[0]); $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252'); if ($res[0] != "&" || $res[1] != "#") diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index 25391d5752..e6aa817276 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -3,9 +3,9 @@ HTML entities with invalid chars and ENT_IGNORE --INI-- output_handler= --FILE-- -<?php +<?php @setlocale (LC_CTYPE, "C"); -$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", +$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", "Voil\xE0", "Clich\xE9s", "\xFE", "\xFE\x41", "\xC3\xA9", "\xC3\x79", "\xF7\xBF\xBF\xBF", "\xFB\xBF\xBF\xBF\xBF", "\xFD\xBF\xBF\xBF\xBF\xBF", "\x41\xF7\xF7\x42", "\x42\xFB\xFB\x42", "\x43\xFD\xFD\x42", "\x44\xF7\xF7", "\x45\xFB\xFB", "\x46\xFD\xFD" @@ -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..dafec86b9a 100644 --- a/ext/standard/tests/strings/htmlentities-utf.phpt +++ b/ext/standard/tests/strings/htmlentities-utf.phpt @@ -3,7 +3,7 @@ HTML entities with invalid chars --INI-- output_handler= --FILE-- -<?php +<?php @setlocale (LC_CTYPE, "C"); $strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", "Voil\xE0", "Clich\xE9s", @@ -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.phpt b/ext/standard/tests/strings/htmlentities.phpt index 5f54ee6753..f2e107a735 100644 --- a/ext/standard/tests/strings/htmlentities.phpt +++ b/ext/standard/tests/strings/htmlentities.phpt @@ -3,7 +3,7 @@ HTML entities of ISO-8859 chars --INI-- output_handler= --FILE-- -<?php +<?php setlocale (LC_CTYPE, "C"); $sc_encoded = htmlspecialchars ("<>\"&åÄ\n",ENT_COMPAT,"ISO-8859-1"); echo $sc_encoded; diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt index 161f02e24a..5d708c21c8 100644 --- a/ext/standard/tests/strings/htmlentities02.phpt +++ b/ext/standard/tests/strings/htmlentities02.phpt @@ -1,5 +1,5 @@ --TEST-- -htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) +htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) --SKIPIF-- <?php $result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro'); diff --git a/ext/standard/tests/strings/htmlentities20.phpt b/ext/standard/tests/strings/htmlentities20.phpt index ff52aca07a..92c996bcb4 100644 --- a/ext/standard/tests/strings/htmlentities20.phpt +++ b/ext/standard/tests/strings/htmlentities20.phpt @@ -6,7 +6,7 @@ function codepoint_to_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities22.phpt b/ext/standard/tests/strings/htmlentities22.phpt index 82dae2ba08..f11982044d 100644 --- a/ext/standard/tests/strings/htmlentities22.phpt +++ b/ext/standard/tests/strings/htmlentities22.phpt @@ -40,7 +40,7 @@ function test($flag, $flag2=ENT_DISALLOWED, $charset="UTF-8") { $i++; $a = htmlentities($test, $flag | $flag2, $charset, FALSE); $b = htmlspecialchars($test, $flag | $flag2, $charset, FALSE); - + if ($a == $b) echo sprintf("%s\t%s", $test, $a==$test?"NOT CHANGED":"CHANGED"), "\n"; else diff --git a/ext/standard/tests/strings/htmlentities_html4.phpt b/ext/standard/tests/strings/htmlentities_html4.phpt index 5d784c2af5..22b0305ced 100644 --- a/ext/standard/tests/strings/htmlentities_html4.phpt +++ b/ext/standard/tests/strings/htmlentities_html4.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index 427ba0bc35..e7c216a292 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -6,7 +6,7 @@ function utf32_utf8($k) { if ($k < 0x80) { $retval = pack('C', $k); } else if ($k < 0x800) { - $retval = pack('C2', + $retval = pack('C2', 0xc0 | ($k >> 6), 0x80 | ($k & 0x3f)); } else if ($k < 0x10000) { diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 44396b0e2b..3ef932a70b 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test htmlspecialchars() function : basic functionality +Test htmlspecialchars() function : basic functionality --FILE-- <?php /* Prototype : string htmlspecialchars ( string $string [, int $quote_style [, string $charset [, bool $double_encode ]]] ) diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index cd78c32206..9dba3c87c5 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test htmlspecialchars_decode() function : basic functionality +Test htmlspecialchars_decode() function : basic functionality --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ echo "*** Testing htmlspecialchars_decode() : basic functionality ***\n"; -// Initialise arguments +// Initialise arguments //value initialized = Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. "double quoted string" $single_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; $double_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; @@ -21,7 +21,7 @@ var_dump( htmlspecialchars_decode($double_quote_string) ); // Calling htmlspecialchars_decode() with optional 'quote_style' argument var_dump( htmlspecialchars_decode($single_quote_string, ENT_COMPAT) ); -var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); +var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($double_quote_string, ENT_NOQUOTES) ); var_dump( htmlspecialchars_decode($single_quote_string, ENT_QUOTES) ); @@ -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_error.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt index 36b8e6bbec..f4201d2842 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test htmlspecialchars_decode() function : error conditions +Test htmlspecialchars_decode() function : error conditions --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 4b4af9c63f..2bbe274d71 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt @@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ @@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; //get a class -class classA +class classA { function __toString() { return "ClassAObject"; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt index da53b0dcc1..0046236259 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt @@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ @@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; // Initialise function arguments -// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " +// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " $string = "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "</html>"; //get a class @@ -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 451a326001..007ff9e209 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -7,7 +7,7 @@ Test htmlspecialchars_decode() function : usage variations - heredoc strings for * Source code: ext/standard/html.c */ -/* +/* * testing htmlspecialchars_decode() with various heredoc strings as argument for $string */ @@ -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..95889b3527 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -21,7 +21,7 @@ $values = array ( '\r\tRoy's height >\r; Sam\t's height', '\n 1\t3 &\tgt; 11 but 11 &\tlt; 12', ); - + // loop through each element of the values array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($values as $value) { @@ -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 a57abd21c4..ad86639576 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -8,7 +8,7 @@ Test htmlspecialchars_decode() function : usage variations - double quoted strin */ /* - * testing htmlspecialchars_decode() for various double quoted strings as argument for $string + * testing htmlspecialchars_decode() for various double quoted strings as argument for $string */ echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; @@ -20,7 +20,7 @@ $strings = array ( "\r\tRoy's height >\r; Sam\t's height", "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12", ); - + // loop through each element of the array to check htmlspecialchars_decode() function with all possible arguments $iterator = 1; foreach($strings as $value) { @@ -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..eb94c9f5ca 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..4a70404ce0 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test http_build_query() function: usage variations - first arguments as object +Test http_build_query() function: usage variations - first arguments as object --CREDITS-- Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ @@ -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..689db9e1fa 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -5,26 +5,26 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ $mDimensional = array( - 20, - 5 => 13, + 20, + 5 => 13, "9" => array( - 1 => "val1", - 3 => "val2", + 1 => "val1", + 3 => "val2", "string" => "string" ), - "name" => "homepage", + "name" => "homepage", "page" => 10, "sort" => array( - "desc", + "desc", "admin" => array( - "admin1", + "admin1", "admin2" => array( - "who" => "admin2", + "who" => "admin2", 2 => "test" ) ) @@ -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..d6d50d1e85 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -5,7 +5,7 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ @@ -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/implode1.phpt b/ext/standard/tests/strings/implode1.phpt Binary files differindex d5de391e96..3720c06927 100644 --- a/ext/standard/tests/strings/implode1.phpt +++ b/ext/standard/tests/strings/implode1.phpt diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 44e7f093c8..1bf9a89c9a 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : basic functionality +Test join() function : basic functionality --FILE-- <?php /* Prototype : string join( string $glue, array $pieces ) @@ -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_error.phpt b/ext/standard/tests/strings/join_error.phpt index 36ee9d7ba6..b283bf4cdb 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -22,10 +22,10 @@ $extra_arg = 10; var_dump( join($glue, $pieces, $extra_arg) ); -// Less than expected number of arguments +// Less than expected number of arguments echo "\n-- Testing join() with less than expected no. of arguments --\n"; $glue = 'string_val'; - + var_dump( join($glue)); echo "Done\n"; diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 8c830c8d07..6407f40dd0 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -68,10 +68,10 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, - + // resource variable $fp, diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt index 1cc4b5fe5c..ba21a25b12 100644 --- a/ext/standard/tests/strings/join_variation2.phpt +++ b/ext/standard/tests/strings/join_variation2.phpt @@ -66,13 +66,13 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, // resource variable $fp, - + // undefined variable @$undefined_var, diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt index c3799cc01a..5b0ad5a528 100644 --- a/ext/standard/tests/strings/join_variation3.phpt +++ b/ext/standard/tests/strings/join_variation3.phpt @@ -9,7 +9,7 @@ Test join() function : usage variations - different values for 'pieces' argument */ /* - * test join() by giving different pieces values + * test join() by giving different pieces values */ echo "*** Testing join() : usage variations ***\n"; @@ -22,21 +22,21 @@ $pieces_arrays = array ( array(), // empty array array(NULL), // array with NULL array("a","aaaa","b","bbbb","c","ccccc"), - + // associative arrays array(1 => "one", 2 => "two", 3 => "three"), // explicit numeric keys, string values array("one" => 1, "two" => 2, "three" => 3 ), // string keys & numeric values array( 1 => 10, 2 => 20, 4 => 40, 3 => 30), // explicit numeric keys and numeric values array( "one" => "ten", "two" => "twenty", "three" => "thirty"), // string key/value array("one" => 1, 2 => "two", 4 => "four"), //mixed - + // associative array, containing null/empty/boolean values as key/value array(NULL => "NULL", null => "null", "NULL" => NULL, "null" => null), array(true => "true", false => "false", "false" => false, "true" => true), array("" => "emptyd", '' => 'emptys', "emptyd" => "", 'emptys' => ''), array(1 => '', 2 => "", 3 => NULL, 4 => null, 5 => false, 6 => true), array('' => 1, "" => 2, NULL => 3, null => 4, false => 5, true => 6), - + // array with repetative keys array("One" => 1, "two" => 2, "One" => 10, "two" => 20, "three" => 3) ); @@ -44,14 +44,14 @@ $pieces_arrays = array ( // a multichar glue value $glue = "], ["; -// loop through each $pieces_arrays element and call join() +// loop through each $pieces_arrays element and call join() $iteration = 1; for($index = 0; $index < count($pieces_arrays); $index ++) { echo "-- Iteration $iteration --\n"; var_dump( join($glue, $pieces_arrays[$index]) ); $iteration ++; } - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt index 361f65bbc5..a02efd7767 100644 --- a/ext/standard/tests/strings/join_variation5.phpt +++ b/ext/standard/tests/strings/join_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : usage variations - sub array as argument +Test join() function : usage variations - sub array as argument --FILE-- <?php /* Prototype : string join( string $glue, array $pieces ) diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt Binary files differindex 71e7f9f42a..412f36cda0 100644 --- a/ext/standard/tests/strings/join_variation6.phpt +++ b/ext/standard/tests/strings/join_variation6.phpt diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt Binary files differindex d09e51eef5..9451ea80a3 100644 --- a/ext/standard/tests/strings/lcfirst.phpt +++ b/ext/standard/tests/strings/lcfirst.phpt diff --git a/ext/standard/tests/strings/levenshtein.phpt b/ext/standard/tests/strings/levenshtein.phpt index 1ac05cf2ae..249b532da7 100644 --- a/ext/standard/tests/strings/levenshtein.phpt +++ b/ext/standard/tests/strings/levenshtein.phpt @@ -1,11 +1,11 @@ --TEST-- levenshtein() function test --FILE-- -<?php - +<?php + function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") { - - if ($cost1=="") { + + if ($cost1=="") { $result=levenshtein($text1,$text2); } elseif ($cost2=="") { @@ -15,52 +15,52 @@ function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") { $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3); } if($result==$expect) return 0; - + echo "$title: result is $result instead of $expect "; echo "for '$text1'/'$text2' "; if($cost1) echo "($cost1:$cost2:$cost3)"; echo "\n"; - + return 1; } - + $n=0; - + $n += test_me("equal" , 0, "12345", "12345"); $n += test_me("1st empty" , 3, "", "xzy"); $n += test_me("2nd empty" , 3, "xzy", ""); $n += test_me("both empty" , 0, "", ""); $n += test_me("1 char" , 1, "1", "2"); $n += test_me("2 char swap", 2, "12", "21"); - + $n += test_me("inexpensive delete", 2, "2121", "11", 2, 1, 1); $n += test_me("expensive delete" , 10, "2121", "11", 2, 1, 5); $n += test_me("inexpensive insert", 2, "11", "2121", 1, 1, 1); $n += test_me("expensive insert" , 10, "11", "2121", 5, 1, 1); - + $n += test_me("expensive replace" , 3, "111", "121", 2, 3, 2); $n += test_me("very expensive replace", 4, "111", "121", 2, 9, 2); - + $n += test_me("bug #7368", 2, "13458", "12345"); $n += test_me("bug #7368", 2, "1345", "1234"); - + $n += test_me("bug #6562", 1, "debugg", "debug"); $n += test_me("bug #6562", 1, "ddebug", "debug"); $n += test_me("bug #6562", 2, "debbbug", "debug"); $n += test_me("bug #6562", 1, "debugging", "debuging"); - + $n += test_me("bug #16473", 2, "a", "bc"); $n += test_me("bug #16473", 2, "xa", "xbc"); $n += test_me("bug #16473", 2, "xax", "xbcx"); $n += test_me("bug #16473", 2, "ax", "bcx"); - + $n += test_me("custom", -1, "111", "121", "my_levcode"); $n += test_me("lt maxlength1", 254, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu", "A"); $n += test_me("gt maxlength1", -1, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv", "A"); - + $n += test_me("lt maxlength2", 254, "A", "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu"); $n += test_me("gt maxlength2", -1, "A", "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv"); - + echo ($n==0)?"all passed\n":"$n failed\n"; var_dump(levenshtein(array(), array())); diff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt index 638c93557f..cddce24688 100644 --- a/ext/standard/tests/strings/ltrim.phpt +++ b/ext/standard/tests/strings/ltrim.phpt @@ -36,7 +36,7 @@ var_dump( ltrim($str, "\nusi") ); var_dump ( ltrim("ABCXYZltrim test", "A..Z") ); /* with characters range as second Argument */ var_dump ( ltrim("0123456789ltrim test", "0..9") ); /* with numbers range as second Argument */ var_dump ( ltrim("@$#ltrim test", "#@$") ); /* with some special characters as second Argument */ - + echo "\n *** Output for scalar argument) ***\n"; var_dump( ltrim( 12345 ) ); /* Scalar argument */ diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt index 45967fa24b..74769cac9f 100644 --- a/ext/standard/tests/strings/ltrim_basic.phpt +++ b/ext/standard/tests/strings/ltrim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ltrim() function : basic functionality +Test ltrim() function : basic functionality --FILE-- <?php @@ -18,13 +18,13 @@ $alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; echo "\n-- Trim string with all white space characters --\n"; var_dump(ltrim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(ltrim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(ltrim($hello, "!oleH=")); -echo "\n-- Trim some non-white space characters from a string suing a character range --\n"; +echo "\n-- Trim some non-white space characters from a string suing a character range --\n"; var_dump(ltrim($alpha, "A..Z")); diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt index 4d6e413672..eb4f938152 100644 --- a/ext/standard/tests/strings/ltrim_error.phpt +++ b/ext/standard/tests/strings/ltrim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ltrim() function : error conditions +Test ltrim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/ltrim_variation1.phpt b/ext/standard/tests/strings/ltrim_variation1.phpt index 48b76e9be7..5e88526609 100644 --- a/ext/standard/tests/strings/ltrim_variation1.phpt +++ b/ext/standard/tests/strings/ltrim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/ltrim_variation2.phpt b/ext/standard/tests/strings/ltrim_variation2.phpt index 40254843a1..194acd187f 100644 --- a/ext/standard/tests/strings/ltrim_variation2.phpt +++ b/ext/standard/tests/strings/ltrim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index 6c12d59dc7..86377e227d 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test md5() function : basic functionality +Test md5() function : basic functionality --FILE-- <?php /* Prototype : string md5 ( string $str [, bool $raw_output= false ] ) @@ -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/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 73bcc33bec..7098dc41b5 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -13,7 +13,7 @@ $md5_raw = md5($str, true); var_dump(bin2hex($md5_raw)); $md5 = md5($str, false); - + if (strcmp(bin2hex($md5_raw), $md5) == 0 ) { echo "TEST PASSED\n"; } else { diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex 8e91776781..777140957c 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt index ef1d23d89a..d1aa9af543 100644 --- a/ext/standard/tests/strings/metaphone.phpt +++ b/ext/standard/tests/strings/metaphone.phpt @@ -13,7 +13,7 @@ var_dump(metaphone("valid phrase", 0)); var_dump(metaphone("valid phrase", 10000)); $array = array( -"They fell forward, grovelling heedlessly on the cold earth.", +"They fell forward, grovelling heedlessly on the cold earth.", "But the shadow of horror wheeled and returned, passing lower now, right above them, sweeping the fen-reek with its ghastly wings.", "And then it was gone, flying back to Mordor with the speed of the wrath of Sauron; and behind it the wind roared away, leaving the Dead Marshes bare and bleak.", "The naked waste, as far as the eye could pierce, even to the distant menace of the mountains, was dappled with the fitful moonlight." @@ -25,7 +25,7 @@ foreach($array as $str) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: metaphone() expects at least 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 61fd816dae..70b5ca574e 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -23,13 +23,13 @@ $value = 1234.5678; $negative_value = -1234.5678; // Format with 14 positions of width, 8 digits of -// left precision, 2 of right precision using national +// left precision, 2 of right precision using national // format for en_US echo "Format values with 14 positions, 8 digits to left, 2 to right using national format\n"; echo gettype(money_format('%14#8.2n', $value))."\n"; echo gettype(money_format('%14#8.2n', $negative_value))."\n"; -// Same again but use '(' for negative values +// Same again but use '(' for negative values echo "Format again but with ( for negative values\n"; echo gettype(money_format('%(14#8.2n', $value))."\n"; echo gettype(money_format('%(14#8.2n', $negative_value))."\n"; @@ -45,12 +45,12 @@ echo gettype(money_format('%=*14#8.2n', $value))."\n"; echo gettype(money_format('%=*14#8.2n', $negative_value))."\n"; // Same again but disable grouping character -echo "Format again but disable grouping character\n"; +echo "Format again but disable grouping character\n"; echo gettype(money_format('%=*^14#8.2n', $value))."\n"; echo gettype(money_format('%=*^14#8.2n', $negative_value))."\n"; // Same again but suppress currency symbol -echo "Format again suppress currency symbol\n"; +echo "Format again suppress currency symbol\n"; echo gettype(money_format('%=*!14#8.2n', $value))."\n"; echo gettype(money_format('%=*!14#8.2n', $negative_value))."\n"; diff --git a/ext/standard/tests/strings/money_format_variation1.phpt b/ext/standard/tests/strings/money_format_variation1.phpt index 4a381c183a..d4fa687db3 100644 --- a/ext/standard/tests/strings/money_format_variation1.phpt +++ b/ext/standard/tests/strings/money_format_variation1.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $formats = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); @@ -99,7 +99,7 @@ foreach($formats as $format) { } // close the file handle -fclose($file_handle); +fclose($file_handle); ?> ===Done=== diff --git a/ext/standard/tests/strings/money_format_variation2.phpt b/ext/standard/tests/strings/money_format_variation2.phpt index c8de58bded..6e01bf03dd 100644 --- a/ext/standard/tests/strings/money_format_variation2.phpt +++ b/ext/standard/tests/strings/money_format_variation2.phpt @@ -26,11 +26,11 @@ unset($unset_var); //defining a couple of sample classes class class_no_tostring { } - + class class_with_tostring { public function __toString() { return " sample object "; - } + } } @@ -47,43 +47,43 @@ $numbers = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // string values /*19*/ "abcd", 'abcd', "0x12f", "%=*!14#8.2nabcd", - + // objects /*23*/ new class_no_tostring(), new class_with_tostring(), - + // resource /*25*/ $file_handle, - + // undefined variable /*26*/ @$undefined_var, - + // unset variable /*27*/ @$unset_var ); 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.phpt b/ext/standard/tests/strings/nl2br.phpt index 728f3339a0..6a3b94023c 100644 --- a/ext/standard/tests/strings/nl2br.phpt +++ b/ext/standard/tests/strings/nl2br.phpt @@ -9,11 +9,11 @@ nl2br() function var_dump(nl2br("\n")); var_dump(nl2br("\r")); var_dump(nl2br("\n\r")); - + var_dump(nl2br("\n\r\r\n\r\r\r\r")); var_dump(nl2br("\n\r\n\n\r\n\r\r\n\r\n")); var_dump(nl2br("\n\r\n\n\n\n\r\r\r\r\n\r")); - + ?> --EXPECT-- string(4) "test" diff --git a/ext/standard/tests/strings/nl2br_error.phpt b/ext/standard/tests/strings/nl2br_error.phpt index b40e7b16a5..dbf4227378 100644 --- a/ext/standard/tests/strings/nl2br_error.phpt +++ b/ext/standard/tests/strings/nl2br_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test nl2br() function : error conditions +Test nl2br() function : error conditions --FILE-- <?php /* Prototype : string nl2br(string $str) diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index a3b863391a..21268d0329 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -7,7 +7,7 @@ Test nl2br() function : usage variations - double quoted strings for 'str' argum * Source code: ext/standard/string.c */ -/* Test nl2br() function by passing double quoted strings containing various +/* Test nl2br() function by passing double quoted strings containing various * combinations of new line chars to 'str' argument */ @@ -22,7 +22,7 @@ $strings = array( "Hello\r\nWorld", "\r\nHello\r\nWorld\r\n", - //one blank line + //one blank line " ", @@ -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/nl2br_variation5.phpt b/ext/standard/tests/strings/nl2br_variation5.phpt index 06a70cbc41..beebe03fe2 100644 --- a/ext/standard/tests/strings/nl2br_variation5.phpt +++ b/ext/standard/tests/strings/nl2br_variation5.phpt @@ -8,7 +8,7 @@ Test nl2br() function : usage variations - unexpected values for 'str' argument */ /* -* Test nl2br() function by passing different types of values other than +* Test nl2br() function by passing different types of values other than * expected type for 'str' argument */ @@ -74,7 +74,7 @@ $values = array( @$unset_var, ); -// loop through $values array to test nl2br() function with each element +// loop through $values array to test nl2br() function with each element $count = 1; foreach($values as $value) { echo "-- Iteration $count --\n"; diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index 25c52cb7ab..7502e2d471 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -1,8 +1,8 @@ --TEST-- -Test nl_langinfo() function : basic functionality +Test nl_langinfo() function : basic functionality --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> @@ -24,10 +24,10 @@ var_dump(nl_langinfo(ABMON_7)); var_dump(nl_langinfo(MON_4)); var_dump(nl_langinfo(RADIXCHAR)); -setlocale(LC_ALL, $original); +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_error1.phpt b/ext/standard/tests/strings/nl_langinfo_error1.phpt index c8f3a284bf..7702b012e9 100644 --- a/ext/standard/tests/strings/nl_langinfo_error1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_error1.phpt @@ -1,8 +1,8 @@ --TEST-- -Test nl_langinfo() function : error conditions +Test nl_langinfo() function : error conditions --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt index 774dc6da6f..c8c92855fc 100644 --- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt @@ -2,7 +2,7 @@ Test nl_langinfo() function : unexpected inputs for '$tem' argument --SKIPIF-- <?php -if( substr(PHP_OS, 0, 3) == 'WIN'){ +if( substr(PHP_OS, 0, 3) == 'WIN'){ die('skip Not for Windows'); } ?> @@ -26,7 +26,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -38,15 +38,15 @@ $items = array ( /*1*/ 2147483647, -2147483648, -20, - + // array values /*4*/ array(), array(0), array(1, 2), - + // objects /*7*/ new sample(), - + // resource /*8*/ $file_handle, ); @@ -63,7 +63,7 @@ foreach($items as $item) { } fclose($file_handle); //closing the file handle -setlocale(LC_ALL, $original); +setlocale(LC_ALL, $original); ?> ===DONE=== @@ -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..0e467b70d0 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -7,7 +7,7 @@ Test number_format() - basic function test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : basic functionality ***\n"; $values = array(1234.5678, @@ -18,10 +18,10 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, - false); + false); echo "\n-- number_format tests.....default --\n"; for ($i = 0; $i < count($values); $i++) { @@ -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/number_format_error.phpt b/ext/standard/tests/strings/number_format_error.phpt index 933466d12b..334b63eacc 100644 --- a/ext/standard/tests/strings/number_format_error.phpt +++ b/ext/standard/tests/strings/number_format_error.phpt @@ -7,7 +7,7 @@ Test number_format() - wrong params test number_format() * Description: Format a number with grouped thousands * Source code: ext/standard/string.c */ - + echo "*** Testing number_format() : error conditions ***\n"; echo "\n-- Testing number_format() function with less than expected no. of arguments --\n"; diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt index f49948206a..19f3ea28d6 100644 --- a/ext/standard/tests/strings/ord_basic.phpt +++ b/ext/standard/tests/strings/ord_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ord() function : basic functionality +Test ord() function : basic functionality --FILE-- <?php @@ -26,7 +26,7 @@ var_dump(ord("Hello")); for ($i = 0; $i < 255; $i++) { if (ord(chr($i)) != $i) { exit("TEST FAILED: $i does not round trip\n"); - } + } } ?> diff --git a/ext/standard/tests/strings/ord_variation1.phpt b/ext/standard/tests/strings/ord_variation1.phpt index ffca230dba..06d9364a08 100644 --- a/ext/standard/tests/strings/ord_variation1.phpt +++ b/ext/standard/tests/strings/ord_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); 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..4cfeb92e4b 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -19,7 +19,7 @@ var_dump( bin2hex(pack("e", -10000000000000000)), bin2hex(pack("e", -0.591234709823149)), bin2hex(pack("e", -12345678901234567890.1234567898765432123456789)), - + 'pack E', bin2hex(pack("E", "")), bin2hex(pack("E", "a")), @@ -36,7 +36,7 @@ var_dump( bin2hex(pack("E", -10000000000000000)), bin2hex(pack("E", -0.591234709823149)), bin2hex(pack("E", -12345678901234567890.1234567898765432123456789)), - + 'pack g', bin2hex(pack("g", "")), bin2hex(pack("g", "a")), @@ -53,7 +53,7 @@ var_dump( bin2hex(pack("g", -10000000000000000)), bin2hex(pack("g", -0.591234709823149)), bin2hex(pack("g", -12345678901234567890.1234567898765432123456789)), - + 'pack G', bin2hex(pack("G", "")), bin2hex(pack("G", "a")), @@ -70,7 +70,7 @@ var_dump( bin2hex(pack("G", -10000000000000000)), bin2hex(pack("G", -0.591234709823149)), bin2hex(pack("G", -12345678901234567890.1234567898765432123456789)), - + 'unpack e', unpack('e', hex2bin('0000000000000000')), unpack('e', hex2bin('000000000000f03f')), @@ -80,7 +80,7 @@ var_dump( unpack('e', hex2bin('0080e03779c341c3')), unpack('e', hex2bin('4a6ade0d65ebe2bf')), unpack('e', hex2bin('e1639d31956ae5c3')), - + 'unpack E', unpack('E', hex2bin('3ff0000000000000')), unpack('E', hex2bin('4341c37937e08000')), @@ -90,7 +90,7 @@ var_dump( unpack('E', hex2bin('c341c37937e08000')), unpack('E', hex2bin('bfe2eb650dde6a4a')), unpack('E', hex2bin('c3e56a95319d63e1')), - + 'unpack g', unpack('g', hex2bin('0000803f')), unpack('g', hex2bin('ca1b0e5a')), @@ -100,7 +100,7 @@ var_dump( unpack('g', hex2bin('ca1b0eda')), unpack('g', hex2bin('285b17bf')), unpack('g', hex2bin('aa542bdf')), - + 'unpack G', unpack('G', hex2bin('3f800000')), unpack('G', hex2bin('5a0e1bca')), @@ -110,10 +110,10 @@ var_dump( unpack('G', hex2bin('da0e1bca')), unpack('G', hex2bin('bf175b28')), unpack('G', hex2bin('df2b54aa')) - + ); ?> ---EXPECTF-- +--EXPECT-- string(6) "pack e" string(16) "0000000000000000" string(16) "0000000000000000" diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index b3f2fe5cfc..a1222814f7 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -1,8 +1,8 @@ --TEST-- -Test parse_str() function : basic functionality +Test parse_str() function : basic functionality --FILE-- <?php - + /* Prototype : void parse_str ( string $str [, array &$arr ] ) * Description: Parses the string into variables * Source code: ext/standard/string.c @@ -29,7 +29,7 @@ var_dump($res2); echo "\nBasic test with an existing array as results array\n"; $res3_array = array(1,2,3,4); var_dump(parse_str($s1, $res3_array)); -var_dump($res3_array); +var_dump($res3_array); ?> ===DONE=== diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt index 32a8fcd3fc..88a13ca387 100644 --- a/ext/standard/tests/strings/parse_str_basic2.phpt +++ b/ext/standard/tests/strings/parse_str_basic2.phpt @@ -1,7 +1,7 @@ --TEST-- Test parse_str() function : non-default arg_separator.input specified --INI-- -arg_separator.input = "/" +arg_separator.input = "/" --FILE-- <?php /* Prototype : void parse_str ( string $str [, array &$arr ] ) diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt Binary files differindex 0368dea5f9..a38395b884 100644 --- a/ext/standard/tests/strings/parse_str_basic3.phpt +++ b/ext/standard/tests/strings/parse_str_basic3.phpt diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index dcc3888e7e..a9c902e807 100644 --- a/ext/standard/tests/strings/parse_str_error1.phpt +++ b/ext/standard/tests/strings/parse_str_error1.phpt @@ -1,7 +1,7 @@ --TEST-- Test parse_str() function : non-default arg_separator.input specified --INI-- -arg_separator.input = "/" +arg_separator.input = "/" --FILE-- <?php /* Prototype : void parse_str ( string $str [, array &$arr ] ) @@ -15,7 +15,7 @@ echo "\n-- Testing htmlentities() function with less than expected no. of argume parse_str(); echo "\n-- Testing htmlentities() function with more than expected no. of arguments --\n"; $s1 = "first=val1&second=val2&third=val3"; -parse_str($s1, $res_array, true); +parse_str($s1, $res_array, true); ?> ===DONE=== diff --git a/ext/standard/tests/strings/pathinfo.phpt b/ext/standard/tests/strings/pathinfo.phpt index a3d735069d..d9c3a2ed6c 100644 --- a/ext/standard/tests/strings/pathinfo.phpt +++ b/ext/standard/tests/strings/pathinfo.phpt @@ -26,7 +26,7 @@ var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: pathinfo() expects at least 1 parameter, 0 given in %s on line %d NULL array(2) { diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt index d9376b101a..4f7ef909e9 100644 --- a/ext/standard/tests/strings/php_strip_whitespace.phpt +++ b/ext/standard/tests/strings/php_strip_whitespace.phpt @@ -39,7 +39,7 @@ var_dump(php_strip_whitespace($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: php_strip_whitespace() expects exactly 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt index 0b75641991..a4bc8c239a 100644 --- a/ext/standard/tests/strings/print_basic.phpt +++ b/ext/standard/tests/strings/print_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test print() function : basic functionality +Test print() function : basic functionality --FILE-- <?php @@ -50,7 +50,7 @@ echo "\n-- Iteration 9 --\n"; print $foo; // foobar echo "\n-- Iteration 10 --\n"; -$variable = "VARIABLE"; +$variable = "VARIABLE"; print <<<END This uses the "here document" syntax to output multiple lines with $variable interpolation. Note diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 8e552e1855..233a21c729 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test print() function : usage variations +Test print() function : usage variations --FILE-- <?php @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); @@ -74,7 +74,7 @@ foreach($inputs as $input) { echo "-- Iteration $count --\n"; $res = print($input); echo "\n"; - var_dump($res); + var_dump($res); $count ++; } diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt index eab44a4a65..d989d6a42a 100644 --- a/ext/standard/tests/strings/printf.phpt +++ b/ext/standard/tests/strings/printf.phpt @@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n"; printf("%%",1.23456789e10); echo"\n\n*** Output for precision value more than maximum ***\n"; -printf("%.988f",1.23456789e10); +printf("%.988f",1.23456789e10); echo"\n\n*** Output for invalid width(-15) specifier ***\n"; -printf("%030.-15s", $tempstring); +printf("%030.-15s", $tempstring); echo"\n\n*** Output for '%F' as the format parameter ***\n"; printf("%F",1.23456789e10); @@ -211,16 +211,16 @@ echo"\n\n*** Output with no format parameter ***\n"; printf($tempnum); echo"\n\n*** Output for multiple format parameters ***\n"; -printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); +printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); echo"\n\n*** Output for excess of mixed type arguments ***\n"; -printf("%s", $tempstring, $tempstring, $tempstring); +printf("%s", $tempstring, $tempstring, $tempstring); echo"\n\n*** Output for string format parameter and integer type argument ***\n"; -printf("%s", $tempnum); +printf("%s", $tempnum); echo"\n\n*** Output for integer format parameter and string type argument ***\n"; -printf("%d", $tempstring); +printf("%d", $tempstring); ?> diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt index 1a90970371..d0b7aaff44 100644 --- a/ext/standard/tests/strings/printf_64bit.phpt +++ b/ext/standard/tests/strings/printf_64bit.phpt @@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n"; printf("%%",1.23456789e10); echo"\n\n*** Output for precision value more than maximum ***\n"; -printf("%.988f",1.23456789e10); +printf("%.988f",1.23456789e10); echo"\n\n*** Output for invalid width(-15) specifier ***\n"; -printf("%030.-15s", $tempstring); +printf("%030.-15s", $tempstring); echo"\n\n*** Output for '%F' as the format parameter ***\n"; printf("%F",1.23456789e10); @@ -211,16 +211,16 @@ echo"\n\n*** Output with no format parameter ***\n"; printf($tempnum); echo"\n\n*** Output for multiple format parameters ***\n"; -printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); +printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); echo"\n\n*** Output for excess of mixed type arguments ***\n"; -printf("%s", $tempstring, $tempstring, $tempstring); +printf("%s", $tempstring, $tempstring, $tempstring); echo"\n\n*** Output for string format parameter and integer type argument ***\n"; -printf("%s", $tempnum); +printf("%s", $tempnum); echo"\n\n*** Output for integer format parameter and string type argument ***\n"; -printf("%d", $tempstring); +printf("%d", $tempstring); ?> 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..f57b263fbf 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -19,7 +19,7 @@ $arg1 = 111; $arg2 = 222; $arg3 = 333; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); @@ -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 1e51d41fc5..2fd6050da2 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..da8f29e795 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -19,7 +19,7 @@ $arg1 = TRUE; $arg2 = FALSE; $arg3 = true; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); @@ -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 57b17d4945..3cdcc1abf4 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..f7e0d2b4f6 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -25,7 +25,7 @@ $arg1 = -1111; $arg2 = -1234567; $arg3 = +2345432; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); @@ -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..626797ffbf 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -29,7 +29,7 @@ $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); @@ -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 e5b8abd726..db1ebba2f7 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -25,12 +25,12 @@ $arg1 = 11; $arg2 = 132; $arg3 = 177; -echo "\n-- Calling printf() with no arguments --\n"; +echo "\n-- Calling printf() with no arguments --\n"; $result = printf($format); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with one arguments --\n"; +echo "\n-- Calling printf() with one arguments --\n"; $result = printf($format1, $arg1); echo "\n"; var_dump($result); @@ -38,7 +38,7 @@ $result = printf($format11, $arg1); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with two arguments --\n"; +echo "\n-- Calling printf() with two arguments --\n"; $result = printf($format2, $arg1, $arg2); echo "\n"; var_dump($result); @@ -46,7 +46,7 @@ $result = printf($format22, $arg1, $arg2); echo "\n"; var_dump($result); -echo "\n-- Calling printf() with three arguments --\n"; +echo "\n-- Calling printf() with three arguments --\n"; $result = printf($format3, $arg1, $arg2, $arg3); echo "\n"; var_dump($result); @@ -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/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index bce0c4d0d7..6645613c83 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test printf() function : error conditions +Test printf() function : error conditions --FILE-- <?php /* Prototype : int printf ( string $format [, mixed $args [, mixed $... ]] ) @@ -21,7 +21,7 @@ $arg1 = 'one'; $arg2 = 'two'; echo "\n-- Call printf with one argument less than expected --\n"; -var_dump( printf($format1) ); +var_dump( printf($format1) ); var_dump( printf($format2,$arg1) ); var_dump( printf($format3,$arg1,$arg2) ); diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index fcf69ebaa7..e71e564da2 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -40,44 +40,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -87,12 +87,12 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with default argument $result = printf($value); echo "\n"; var_dump($result); - + // with two arguments $result = printf($value, $arg1); echo "\n"; diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index 8e7d5ec910..be66ad8fca 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "Object"; - } + } } // creating a file resource @@ -38,48 +38,48 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // string data /*23*/ "string", 'string', - + // object data /*25*/ new sample(), - + // undefined data /*26*/ @$undefined_var, - + // unset data /*27*/ @$unset_var, - + // resource data /*28*/ $file_handle ); @@ -89,7 +89,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with two arguments $result = printf($format, $value); echo "\n"; @@ -99,8 +99,8 @@ foreach($values as $value) { $result = printf($format, $value, $arg2); echo "\n"; var_dump($result); - - $count++; + + $count++; }; // closing the resource diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 9556dad30f..d58d3f9056 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quoted_printable_decode() function : basic functionality +Test quoted_printable_decode() function : basic functionality --FILE-- <?php /* Prototype : string quoted_printable_decode ( string $str ) @@ -13,13 +13,13 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= =20=D4=cf=D2=C7=CF=D7=D9=C5= =20= =D0= -=D2=CF=C5=CB=D4=D9"; +=D2=CF=C5=CB=D4=D9"; 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/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt index 9008f5c861..0515fea2a7 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quoted_printable_decode() function : error conditions +Test quoted_printable_decode() function : error conditions --FILE-- <?php /* Prototype : string quoted_printable_decode ( string $str ) @@ -17,7 +17,7 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= =20=D4=cf=D2=C7=CF=D7=D9=C5= =20= =D0= -=D2=CF=C5=CB=D4=D9"; +=D2=CF=C5=CB=D4=D9"; $extra_arg = 10; var_dump( quoted_printable_decode($str, $extra_arg) ); diff --git a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt index 8d147c0e67..ce35cea6b8 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt @@ -40,44 +40,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/quoted_printable_encode_001.phpt b/ext/standard/tests/strings/quoted_printable_encode_001.phpt index 1ce7d791dc..6a22da8afc 100644 --- a/ext/standard/tests/strings/quoted_printable_encode_001.phpt +++ b/ext/standard/tests/strings/quoted_printable_encode_001.phpt @@ -16,7 +16,7 @@ var_dump(quoted_printable_encode(false)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: quoted_printable_encode() expects exactly 1 parameter, 0 given in %s on line %d NULL string(0) "" diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 00572add56..413ae21fd2 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quotemeta() function : basic functionality +Test quotemeta() function : basic functionality --FILE-- <?php @@ -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/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index dbbd6c6154..7193b59866 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rtrim() function : basic functionality +Test rtrim() function : basic functionality --FILE-- <?php @@ -20,13 +20,13 @@ $binary = "Example string\x0A\x0D"; echo "\n-- Trim string with all white space characters --\n"; var_dump(rtrim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(rtrim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(rtrim($hello, "!dlWro=")); -echo "\n-- Trim some non-white space characters from a string using a character range --\n"; +echo "\n-- Trim some non-white space characters from a string using a character range --\n"; var_dump(rtrim($alpha, "A..Z")); echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; diff --git a/ext/standard/tests/strings/rtrim_error.phpt b/ext/standard/tests/strings/rtrim_error.phpt index 108f96a1f0..3cdfb9116d 100644 --- a/ext/standard/tests/strings/rtrim_error.phpt +++ b/ext/standard/tests/strings/rtrim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rtrim() function : error conditions +Test rtrim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/rtrim_variation1.phpt b/ext/standard/tests/strings/rtrim_variation1.phpt index f07b7db3df..68c7bb9079 100644 --- a/ext/standard/tests/strings/rtrim_variation1.phpt +++ b/ext/standard/tests/strings/rtrim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " !---sample object---! "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/rtrim_variation2.phpt b/ext/standard/tests/strings/rtrim_variation2.phpt index 70efd09f2b..9e3943dfe4 100644 --- a/ext/standard/tests/strings/rtrim_variation2.phpt +++ b/ext/standard/tests/strings/rtrim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt index 08c4cf4424..c806e6fabf 100644 --- a/ext/standard/tests/strings/setlocale_basic1.phpt +++ b/ext/standard/tests/strings/setlocale_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test setlocale() function : basic functionality - setting system locale to a specific +Test setlocale() function : basic functionality - setting system locale to a specific --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -12,16 +12,16 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , - * or FALSE if locale functionality is not implemented in this platform. + : string setlocale(int $category , array $locale); + * Description: Sets locale information.Returns the new current locale , + * or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ /* test setlocale by specifying a specific locale as input */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -50,9 +50,9 @@ echo "*** Testing setlocale() : basic functionality - set to a specific locale * //set of locales to be used $common_locales = array( - "english_US"=> "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", @@ -79,18 +79,18 @@ $currency_symbol = array( // gather all the locales installed in the system $all_system_locales = list_system_locales(); -// set the system locale to a locale, choose the right locale by -// finding a common locale in commonly used locale stored in -// $common_locales & locales that are available in the system, stored -// in $all_system_locales. +// set the system locale to a locale, choose the right locale by +// finding a common locale in commonly used locale stored in +// $common_locales & locales that are available in the system, stored +// in $all_system_locales. echo "Setting system locale(LC_ALL) to "; foreach($common_locales as $value) { - // check if a commonly used locale is installed in the system + // check if a commonly used locale is installed in the system if(in_array($value, $all_system_locales)){ echo "$value\n"; // print, this is found // set the found locale as current locale var_dump(setlocale(LC_ALL, $value )); - // stop here + // stop here break; } else{ diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt index 75ae1545d9..7204c45911 100644 --- a/ext/standard/tests/strings/setlocale_basic2.phpt +++ b/ext/standard/tests/strings/setlocale_basic2.phpt @@ -12,16 +12,16 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); + : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functionality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ /* Test the setlocale() when an array is provided as input containing list of locales */ /* Prototype : array list_system_locales( void ) - * Description: To get the currently installed locle in this platform + * Description: To get the currently installed locle in this platform * Arguments : Nil * Returns : set of locale as array */ @@ -44,16 +44,16 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and prepare a list of locales that can be used as +/* Collect existing system locales and prepare a list of locales that can be used as input to setlocale() */ echo "*** Testing setlocale() with an array containing list of locales ***\n"; //set of locales to be used $common_locales = array( - "english_US"=> "en_US.utf8", - "english_AU" => "en_AU.utf8", - "korean_KR" => "ko_KR.utf8", + "english_US"=> "en_US.utf8", + "english_AU" => "en_AU.utf8", + "korean_KR" => "ko_KR.utf8", "Chinese_zh" => "zh_CN.utf8", "germen_DE" => "de_DE.utf8", "spanish_es" => "es_EC.utf8", @@ -91,7 +91,7 @@ foreach($common_locales as $value) { } } -// Now $list_of_locales array contains the locales that can be passed to +// Now $list_of_locales array contains the locales that can be passed to // setlocale() function. echo "-- Testing setlocale() : 'category' argument as LC_ALL & 'locale' argument as an array --\n"; if ( count($list_of_locales) > 0 ) { @@ -111,7 +111,7 @@ if ( count($list_of_locales) > 0 ) { if(trim($currency_symbol[$new_locale]) == $new_currency){ echo "PASSED.\n"; - } else { + } else { echo "FAILED.\n"; } } else { diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt index 46beeda10e..997dad98e7 100644 --- a/ext/standard/tests/strings/setlocale_basic3.phpt +++ b/ext/standard/tests/strings/setlocale_basic3.phpt @@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Test the setlocale() when multiple locales are provided as argument */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and get three locales that can be use to +/* Collect existing system locales and get three locales that can be use to pass as argument to setlocale() */ echo "*** Testing setlocale() by passing multiple locales as argument ***\n"; diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index 14bb7d7ed5..a6a8e38205 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -11,8 +11,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. + : string setlocale(int $category , array $locale); + * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt index 6dc4179baf..04665b5455 100644 --- a/ext/standard/tests/strings/setlocale_variation1.phpt +++ b/ext/standard/tests/strings/setlocale_variation1.phpt @@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Test the setlocale() when multiple valid/invalid locales are provided as argument */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and get 2 valid locales that can be use to +/* Collect existing system locales and get 2 valid locales that can be use to pass as argument to setlocale(), pass 2 invalid arguments along with two valid arguments*/ echo "*** Testing setlocale() by passing multiple valid/invalid locales as argument ***\n"; diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index fad3298cc7..5ebdfe8d50 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test setlocale() function : usage variations - Setting all available locales in the platform +Test setlocale() function : usage variations - Setting all available locales in the platform --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -9,16 +9,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functionality is not implemented in this platform. + : string setlocale(int $category , array $locale); + * Description: Sets locale information.Returns the new current locale , or FALSE + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ /* setlocale() to set all available locales in the system and check the success count */ echo "*** Testing setlocale() : usage variations ***\n"; -function good_locale($locale) { +function good_locale($locale) { /** * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416 **/ @@ -26,7 +26,7 @@ function good_locale($locale) { } /* Prototype : array list_system_locales( void ) - * Description: To get the currently installed locle in this platform + * Description: To get the currently installed locle in this platform * Arguments : Nil * Returns : set of locale as array */ @@ -52,7 +52,7 @@ function list_system_locales() { // gather all the locales installed in the system $all_system_locales = list_system_locales(); -//try different locale names +//try different locale names $failure_locale = array(); $success_count = 0; @@ -74,7 +74,7 @@ echo "No of locales found on the machine = ".count($all_system_locales)."\n"; echo "No of setlocale() success = ".$success_count."\n"; echo "Expected no of failures = 0\n"; echo "Test "; -// check if there were any failure of setlocale() function earlier, if any +// check if there were any failure of setlocale() function earlier, if any // failure then dump the list of failing locales if($success_count != count($all_system_locales)){ echo "FAILED\n"; diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index d1e06a0540..2b12d26d14 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -12,9 +12,9 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) { --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); + * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ @@ -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..47ae8fcc97 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -14,9 +14,9 @@ LC_ALL=en_US.utf8; --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); + * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ @@ -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..85d06e1a74 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -14,9 +14,9 @@ LC_ALL=en_US.utf8; --FILE-- <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) - * : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * : string setlocale(int $category , array $locale); + * Description: Sets locale information.Returns the new current locale , or FALSE + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ @@ -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_error.phpt b/ext/standard/tests/strings/sha1_error.phpt index 193c64e941..bfc3e44fd5 100644 --- a/ext/standard/tests/strings/sha1_error.phpt +++ b/ext/standard/tests/strings/sha1_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : error conditions +Test sha1() function : error conditions --FILE-- <?php @@ -7,7 +7,7 @@ Test sha1() function : error conditions /* Prototype: string sha1 ( string $str [, bool $raw_output ] ) * Description: Calculate the sha1 hash of a string */ - + echo "*** Testing sha1() : error conditions ***\n"; echo "\n-- Testing sha1() function with no arguments --\n"; diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 83a191b172..20d62e6999 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -17,7 +17,7 @@ return false; if (($handle2 = fopen( "DataFile.txt", "w+")) == FALSE) return false; -/* Writing into file */ +/* Writing into file */ $filename = "DataFile.txt"; $content = "Add this to the file\n"; if (is_writable($filename)) { @@ -27,7 +27,7 @@ if (is_writable($filename)) { } } -// close the files +// close the files fclose($handle); fclose($handle2); diff --git a/ext/standard/tests/strings/sha1_variation1.phpt b/ext/standard/tests/strings/sha1_variation1.phpt index 35fb16a87b..044be46d98 100644 --- a/ext/standard/tests/strings/sha1_variation1.phpt +++ b/ext/standard/tests/strings/sha1_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : usage variations - unexpected values for 'str' argument +Test sha1() function : usage variations - unexpected values for 'str' argument --FILE-- <?php @@ -35,44 +35,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.1234567E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt index f784a8900f..eb11760b76 100644 --- a/ext/standard/tests/strings/sha1_variation2.phpt +++ b/ext/standard/tests/strings/sha1_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : usage variations - unexpected values for 'raw' argument +Test sha1() function : usage variations - unexpected values for 'raw' argument --FILE-- <?php @@ -35,44 +35,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.1234567E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // string data /*17*/ "ABC", 'abc', "0abc", "123abc", - + // empty data /*21*/ "", '', - + // object data /*23*/ new MyClass(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + //resource data /*26*/ $fp ); @@ -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..c4c2bd83f2 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments ***\n"; $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = 'baz'; } /* some code here */ - + 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> +<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> </span> </code> diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index b59776a4d2..568b842338 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -9,20 +9,20 @@ echo "*** Test by calling method or function with its expected arguments and php $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } /* some code here */ -echo $baz; +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"> -<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 php output ***\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: #007700">echo </span><span style="color: #0000BB">$baz</span><span style="color: #007700">;<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 />echo </span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> +<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 php output ***\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: #007700">echo </span><span style="color: #0000BB">$baz</span><span style="color: #007700">; <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 />echo </span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> </code>bar diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index d9af024fd9..8224d0eee6 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments and out $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } - /* some code here */ + /* some code here */ $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> +string(1987) "<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> </span> </code>" 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/soundex.phpt b/ext/standard/tests/strings/soundex.phpt index 650236c2e5..55769ad57e 100644 --- a/ext/standard/tests/strings/soundex.phpt +++ b/ext/standard/tests/strings/soundex.phpt @@ -11,10 +11,10 @@ $array = array( "From", "that", "time", -"on", +"on", "Sam", -"thought", -"that", +"thought", +"that", "he", "sensed", "a", @@ -31,7 +31,7 @@ foreach ($array as $str) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- bool(false) string(4) "0000" diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt index 401eb67460..9777473ee9 100644 --- a/ext/standard/tests/strings/soundex_basic.phpt +++ b/ext/standard/tests/strings/soundex_basic.phpt @@ -9,9 +9,9 @@ Test soundex() function : basic functionality echo "*** Testing soundex() : basic functionality ***\n"; var_dump(soundex("Euler")); -var_dump(soundex("Gauss")); -var_dump(soundex("Hilbert")); -var_dump(soundex("Knuth")); +var_dump(soundex("Gauss")); +var_dump(soundex("Hilbert")); +var_dump(soundex("Knuth")); var_dump(soundex("Lloyd")); var_dump(soundex("Lukasiewicz")); @@ -23,8 +23,8 @@ var_dump(soundex("Lloyd") == soundex("Ladd")); // L300 var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222 var_dump(soundex("Lukasiewicz") == soundex("Ghosh")); -var_dump(soundex("Hilbert") == soundex("Ladd")); -?> +var_dump(soundex("Hilbert") == soundex("Ladd")); +?> ===DONE=== --EXPECT-- *** Testing soundex() : basic functionality *** @@ -42,4 +42,5 @@ bool(true) bool(true) bool(false) bool(false) + ===DONE=== diff --git a/ext/standard/tests/strings/soundex_error.phpt b/ext/standard/tests/strings/soundex_error.phpt index 8ff93b6d70..20cf2c9d3e 100644 --- a/ext/standard/tests/strings/soundex_error.phpt +++ b/ext/standard/tests/strings/soundex_error.phpt @@ -6,7 +6,7 @@ Test soundex() function : error conditions * Description: Calculate the soundex key of a string * Source code: ext/standard/string.c */ - + echo "\n*** Testing soundex error conditions ***"; echo "-- Testing soundex() function with Zero arguments --\n"; @@ -17,7 +17,7 @@ $str = "Euler"; $extra_arg = 10; var_dump( soundex( $str, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing soundex error conditions ***-- Testing soundex() function with Zero arguments -- @@ -30,4 +30,5 @@ NULL Warning: soundex() expects exactly 1 parameter, 2 given in %s on line %d NULL -===DONE=== + +===DONE===
\ No newline at end of file diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index 4507cbd97d..18317373f4 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..16c035f34b 100644 --- a/ext/standard/tests/strings/sprintf_basic2.phpt +++ b/ext/standard/tests/strings/sprintf_basic2.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..e6cd477bfa 100644 --- a/ext/standard/tests/strings/sprintf_basic3.phpt +++ b/ext/standard/tests/strings/sprintf_basic3.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..5dd5dd26b6 100644 --- a/ext/standard/tests/strings/sprintf_basic4.phpt +++ b/ext/standard/tests/strings/sprintf_basic4.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..8ccb899b2f 100644 --- a/ext/standard/tests/strings/sprintf_basic5.phpt +++ b/ext/standard/tests/strings/sprintf_basic5.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..882aacc107 100644 --- a/ext/standard/tests/strings/sprintf_basic6.phpt +++ b/ext/standard/tests/strings/sprintf_basic6.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..9554ca1f59 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..b00c05bc8f 100644 --- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - unsigned format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..538122101d 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..2facb3f896 100644 --- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..9271bf92c9 100644 --- a/ext/standard/tests/strings/sprintf_basic9.phpt +++ b/ext/standard/tests/strings/sprintf_basic9.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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_error.phpt b/ext/standard/tests/strings/sprintf_error.phpt index 1c12cd3168..f7f9e37e77 100644 --- a/ext/standard/tests/strings/sprintf_error.phpt +++ b/ext/standard/tests/strings/sprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sprintf() function : error conditions +Test sprintf() function : error conditions --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -21,7 +21,7 @@ $arg1 = 'one'; $arg2 = 'two'; // with one argument less than expected -var_dump( sprintf($format1) ); +var_dump( sprintf($format1) ); var_dump( sprintf($format2,$arg1) ); var_dump( sprintf($format3,$arg1,$arg2) ); diff --git a/ext/standard/tests/strings/sprintf_f_2.phpt b/ext/standard/tests/strings/sprintf_f_2.phpt index 9ee0aae17f..1c7cc7f924 100644 --- a/ext/standard/tests/strings/sprintf_f_2.phpt +++ b/ext/standard/tests/strings/sprintf_f_2.phpt @@ -77,7 +77,7 @@ var_dump(sprintf("%01.2f", $money)); // output "123.10" /* example#9: scientific notation */ $number = 362525200; - + var_dump(sprintf("%.3e", $number)); // outputs 3.63e+8 ?> --EXPECTREGEX-- diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index f7bb9dec00..2a5bdfdec9 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unexpected values for format argume --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -87,7 +87,7 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with default argument var_dump( sprintf($value) ); diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index a0e7d0b0ca..2b338b238a 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -42,7 +42,7 @@ $float_formats = array( $count = 1; foreach($integer_values as $int_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $int_value) ); @@ -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_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt index cb2a3a9cac..21e01883a6 100644 --- a/ext/standard/tests/strings/sprintf_variation11.phpt +++ b/ext/standard/tests/strings/sprintf_variation11.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -21,8 +21,8 @@ $resource_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -30,7 +30,7 @@ $float_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $resource_value) ); diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index 8614ea4d0a..b11e5f5eb2 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sprintf() function : usage variations - float formats with arrays +Test sprintf() function : usage variations - float formats with arrays --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -29,8 +29,8 @@ $array_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -38,7 +38,7 @@ $float_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { // with two arguments var_dump( sprintf($format, $array_value) ); @@ -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 45d6c5fa25..ce1567a24d 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -35,8 +35,8 @@ $string_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -44,7 +44,7 @@ $float_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 92bb8dfd08..8c1278e9e0 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,8 +19,8 @@ $boolean_values = array ( // various float formats $float_formats = array( - "%f", "%hf", "%lf", - "%Lf", " %f", "%f ", + "%f", "%hf", "%lf", + "%Lf", " %f", "%f ", "\t%f", "\n%f", "%4f", "%30f", "%[0-9]", "%*f" ); @@ -28,7 +28,7 @@ $float_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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 1559cea83b..1ec44a6d03 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..c89b651fdf 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( -2147483649, 2147483648, @@ -29,9 +29,9 @@ $float_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -39,7 +39,7 @@ $string_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt index dc9bc8bcad..8ba55070e8 100644 --- a/ext/standard/tests/strings/sprintf_variation17.phpt +++ b/ext/standard/tests/strings/sprintf_variation17.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ $resource_values = array ( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -30,7 +30,7 @@ $string_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 645d3e96ea..40fc7d9757 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -28,9 +28,9 @@ $array_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -38,7 +38,7 @@ $string_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $array_value) ); } @@ -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..916896e5fa 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -32,9 +32,9 @@ $integer_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -42,7 +42,7 @@ $string_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 967949a09c..a663df4444 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with all types of values for arg1 a --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -24,7 +24,7 @@ class sample { public function __toString() { return "Object"; - } + } } // creating a file resource @@ -89,14 +89,14 @@ $values = array( $count = 1; foreach($values as $value) { echo "\n-- Iteration $count --\n"; - + // with two arguments var_dump( sprintf($format, $value) ); // with three arguments var_dump( sprintf($format, $value, $arg2) ); - - $count++; + + $count++; }; // closing the resource diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 9283e76b8b..6ac7cbb18a 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, @@ -18,9 +18,9 @@ $boolean_values = array( ); // array of string formats -$string_formats = array( - "%s", "%hs", "%ls", - "%Ls"," %s", "%s ", +$string_formats = array( + "%s", "%hs", "%ls", + "%Ls"," %s", "%s ", "\t%s", "\n%s", "%4s", "%30s", "%[a-zA-Z0-9]", "%*s" ); @@ -28,7 +28,7 @@ $string_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($string_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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..083f3827fe 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 db6599c10c..ef92e521e8 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_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt index fc3148c0be..09e5b9fbb2 100644 --- a/ext/standard/tests/strings/sprintf_variation23.phpt +++ b/ext/standard/tests/strings/sprintf_variation23.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - char formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,8 +20,8 @@ $resource_values = array ( ); // array of char formats -$char_formats = array( - "%c", "%hc", "%lc", +$char_formats = array( + "%c", "%hc", "%lc", "%Lc", " %c", "%c ", "\t%c", "\n%c", "%4c", "%30c", "%[a-bA-B@#$&]", "%*c" @@ -30,7 +30,7 @@ $char_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($char_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 772b94381b..3d874b5cbd 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 027dd7c9db..1525a41cd5 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 88c8bd42a4..580796add0 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 43974cecc3..01bb956384 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..1474aad1bd 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -48,7 +48,7 @@ $octal_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..c13d5b9b8c 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -44,7 +44,7 @@ $octal_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..641db49518 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 0.0, -0.1, @@ -28,9 +28,9 @@ $float_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -38,7 +38,7 @@ $octal_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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..6e7303521c 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 0.0, -0.1, @@ -24,9 +24,9 @@ $float_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -34,7 +34,7 @@ $octal_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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..ab4fbb1caf 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : integer formats with integer values ***\n"; -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, @@ -37,11 +37,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($valid_ints as $int_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $int_value) ); } @@ -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_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt index d0beeb9501..78d8e133bf 100644 --- a/ext/standard/tests/strings/sprintf_variation30.phpt +++ b/ext/standard/tests/strings/sprintf_variation30.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - octal formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ $resource_values = array ( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -30,7 +30,7 @@ $octal_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index c5064127e1..59a9cfcbc1 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with array values ***\n"; -// different arrays used to test the function +// different arrays used to test the function $array_values = array( array(), array(0), @@ -27,9 +27,9 @@ $array_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -37,7 +37,7 @@ $octal_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $array_value) ); } @@ -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 d61c6b7c67..ee72d0521c 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', @@ -33,9 +33,9 @@ $string_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -43,7 +43,7 @@ $octal_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 aa2c96f012..acd4781c02 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, @@ -18,9 +18,9 @@ $boolean_values = array( ); // array of octal formats -$octal_formats = array( - "%o", "%ho", "%lo", - "%Lo", " %o", "%o ", +$octal_formats = array( + "%o", "%ho", "%lo", + "%Lo", " %o", "%o ", "\t%o", "\n%o", "%4o", "%30o", "%[0-7]", "%*o" ); @@ -28,7 +28,7 @@ $octal_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($octal_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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..ce2d01ca12 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -31,9 +31,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); @@ -48,7 +48,7 @@ $hexa_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..2d095cd739 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -27,9 +27,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); @@ -44,7 +44,7 @@ $hexa_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..c658a767bf 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int @@ -32,8 +32,8 @@ $float_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -42,7 +42,7 @@ $hexa_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { // with two arguments var_dump( sprintf($format, $float_value) ); @@ -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..64beaf1368 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int @@ -28,8 +28,8 @@ $float_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -38,7 +38,7 @@ $hexa_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { // with two arguments var_dump( sprintf($format, $float_value) ); @@ -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_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt index bf05a99db4..d7d6999de8 100644 --- a/ext/standard/tests/strings/sprintf_variation36.phpt +++ b/ext/standard/tests/strings/sprintf_variation36.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - hexa formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,8 +20,8 @@ $resource_values = array ( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -30,7 +30,7 @@ $hexa_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index f8abfb75fe..4406be95d9 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), @@ -26,8 +26,8 @@ $array_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -36,7 +36,7 @@ $hexa_formats = array( $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $array_value) ); } @@ -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 160b56b2c9..79948b24af 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', @@ -32,8 +32,8 @@ $string_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -42,7 +42,7 @@ $hexa_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 0180dd55d8..f3d0f8c21d 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, @@ -18,8 +18,8 @@ $boolean_values = array( ); // array of hexa formats -$hexa_formats = array( - "%x", "%xx", "%lx", +$hexa_formats = array( + "%x", "%xx", "%lx", "%Lx", " %x", "%x ", "\t%x", "\n%x", "%4x", "%30x", "%[0-9A-Fa-f]", "%*x" @@ -28,7 +28,7 @@ $hexa_formats = array( $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($hexa_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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..848e26de13 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -39,11 +39,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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..65f78fa7a2 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -31,9 +31,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); @@ -49,7 +49,7 @@ $unsigned_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..e4d36f439f 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with integer value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -27,9 +27,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); @@ -45,7 +45,7 @@ $unsigned_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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..713df9a2a3 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int @@ -39,7 +39,7 @@ $float_values = array( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -47,7 +47,7 @@ $unsigned_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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..79e6275fcb 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int @@ -35,7 +35,7 @@ $float_values = array( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -43,7 +43,7 @@ $unsigned_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt index 760c173a00..f9f7dd631d 100644 --- a/ext/standard/tests/strings/sprintf_variation42.phpt +++ b/ext/standard/tests/strings/sprintf_variation42.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unsigned formats with resource valu --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -22,7 +22,7 @@ $resource_values = array ( // array of unsigned formats $unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", + "%Lu", " %u", "%u ", "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -31,7 +31,7 @@ $unsigned_formats = array( $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index 1166d5ed34..a828e6b892 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), @@ -28,17 +28,17 @@ $array_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $array_value) ); } @@ -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..73e786e3df 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', @@ -40,10 +40,10 @@ $string_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -51,7 +51,7 @@ $unsigned_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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..1be1db709c 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', @@ -36,10 +36,10 @@ $string_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); @@ -47,7 +47,7 @@ $unsigned_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 46eb67dd9c..85dcfceab7 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with boolean value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, @@ -18,17 +18,17 @@ $boolean_values = array( ); // array of unsigned formats -$unsigned_formats = array( +$unsigned_formats = array( "%u", "%hu", "%lu", - "%Lu", " %u", "%u ", - "\t%u", "\n%u", "%4u", + "%Lu", " %u", "%u ", + "\t%u", "\n%u", "%4u", "%30u", "%[0-9]", "%*u" ); $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($unsigned_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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..11bdb23cf6 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with integer val --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -25,9 +25,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); @@ -42,7 +42,7 @@ $scientific_formats = array( $count = 1; foreach($integer_values as $integer_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $integer_value) ); } @@ -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 fe11efb401..78d68fa4f4 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with float value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( -2147483649, 2147483648, @@ -44,7 +44,7 @@ $scientific_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt index ac551a4453..758b705c0d 100644 --- a/ext/standard/tests/strings/sprintf_variation48.phpt +++ b/ext/standard/tests/strings/sprintf_variation48.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - scientific formats with resource va --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,17 +20,17 @@ $resource_values = array ( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($resource_values as $resource_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $resource_value) ); } diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index 36b2407b2c..d4807b1a2a 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with array value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), @@ -29,17 +29,17 @@ $array_values = array( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($array_values as $array_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $array_value) ); } @@ -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..a5fd306fd5 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : usage variations - int formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -35,11 +35,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt index 4fc37435ef..ee13d3d64b 100644 --- a/ext/standard/tests/strings/sprintf_variation5.phpt +++ b/ext/standard/tests/strings/sprintf_variation5.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ $dfp = opendir ( dirname(__FILE__) ); $fp_copy = $fp; $dfp_copy = $dfp; - + // array of resource types $resource_types = array ( $fp_copy, @@ -28,11 +28,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%[0-9]", "%*d" ); - + $count = 1; foreach($resource_types as $res) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $res) ); } diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index cce7cdbadb..fc27b2c932 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with string valu --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', @@ -44,7 +44,7 @@ $scientific_formats = array( $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 70e70b0887..9ee693e142 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with boolean val --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, @@ -18,17 +18,17 @@ $boolean_values = array( ); // array of scientific formats -$scientific_formats = array( +$scientific_formats = array( "%e", "%he", "%le", "%Le", " %e", "%e ", - "\t%e", "\n%e", "%4e", + "\t%e", "\n%e", "%4e", "%30e", "%[0-1]", "%*e" ); $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($scientific_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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_variation52.phpt b/ext/standard/tests/strings/sprintf_variation52.phpt index 7817f77b2f..996434fef4 100644 --- a/ext/standard/tests/strings/sprintf_variation52.phpt +++ b/ext/standard/tests/strings/sprintf_variation52.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - typical format strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 199a957979..87c91389e6 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with whitespaces in format strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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 f21005dcde..c41db4e637 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with arrays --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -32,14 +32,14 @@ $array_types = array ( $int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", - "\t%d", "\n%d", "%4d", + "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($array_types as $arr) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $arr) ); } @@ -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 3b858ca7e4..b7ce8d94d2 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -21,14 +21,14 @@ $boolean_values = array ( $int_formats = array( "%d", "%hd", "%ld", "%Ld", " %d", "%d ", - "\t%d", "\n%d", "%4d", + "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($boolean_values as $boolean_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $boolean_value) ); } @@ -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 731933a846..7fd608b819 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -41,11 +41,11 @@ $int_formats = array( "\t%d", "\n%d", "%4d", "%30d", "%[0-9]", "%*d" ); - + $count = 1; foreach($string_values as $string_value) { echo "\n-- Iteration $count --\n"; - + foreach($int_formats as $format) { var_dump( sprintf($format, $string_value) ); } @@ -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 b189422572..6be495aa42 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -55,7 +55,7 @@ $float_formats = array( $count = 1; foreach($float_values as $float_value) { echo "\n-- Iteration $count --\n"; - + foreach($float_formats as $format) { var_dump( sprintf($format, $float_value) ); } @@ -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/sscanf_basic1.phpt b/ext/standard/tests/strings/sscanf_basic1.phpt index 8a38f9d19e..dadafbde2c 100644 --- a/ext/standard/tests/strings/sscanf_basic1.phpt +++ b/ext/standard/tests/strings/sscanf_basic1.phpt @@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using string format ***\n"; $str = "Part: Widget Serial Number: 1234789 Stock: 25"; $format = "Part: %s Serial Number: %s Stock: %s"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $number, $stock) = sscanf($str, $format); var_dump($part, $number, $stock); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $number, $stock); -var_dump($res, $part, $number, $stock); +var_dump($res, $part, $number, $stock); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic2.phpt b/ext/standard/tests/strings/sscanf_basic2.phpt index 92f4d1051e..693a307c05 100644 --- a/ext/standard/tests/strings/sscanf_basic2.phpt +++ b/ext/standard/tests/strings/sscanf_basic2.phpt @@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using integer format ***\n"; $str = "Part: Widget Serial Number: 1234789 Stock: 25"; $format = "Part: %s Serial Number: %d Stock: %d"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $number, $stock) = sscanf($str, $format); var_dump($part, $number, $stock); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $number, $stock); -var_dump($res, $part, $number, $stock); +var_dump($res, $part, $number, $stock); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic3.phpt b/ext/standard/tests/strings/sscanf_basic3.phpt index b728dea34d..de910ef4b8 100644 --- a/ext/standard/tests/strings/sscanf_basic3.phpt +++ b/ext/standard/tests/strings/sscanf_basic3.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality -- using float format ***\n"; $str = "Part: Widget Length: 111.53 Width: 22.345 Depth: 12.4"; $format = "Part: %s Length: %f Width: %f Depth: %f"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($part, $length, $width, $depth) = sscanf($str, $format); var_dump($part, $length, $width, $depth); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $part, $length, $width, $depth); -var_dump($res, $part, $length, $width, $depth); +var_dump($res, $part, $length, $width, $depth); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt index 8ed760afde..8ce44ff4c8 100644 --- a/ext/standard/tests/strings/sscanf_basic4.phpt +++ b/ext/standard/tests/strings/sscanf_basic4.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using char format ***\n"; $str = "X = A + B - C"; $format = "%c = %c + %c - %c"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic5.phpt b/ext/standard/tests/strings/sscanf_basic5.phpt index 36c2feba9d..5dbbf44813 100644 --- a/ext/standard/tests/strings/sscanf_basic5.phpt +++ b/ext/standard/tests/strings/sscanf_basic5.phpt @@ -14,19 +14,19 @@ $str = "10.12345 10.12345E3 10.12345e3 -10.12345e4" ; $format1 = "%e %e %e %e"; $format2 = "%E %E %E %E"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4); list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); $res = sscanf($str, $format2,$arg1, $arg2, $arg3, $arg4); -var_dump($res, $arg1, $arg2, $arg3, $arg4); +var_dump($res, $arg1, $arg2, $arg3, $arg4); ?> diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt index 381ccc12c2..6efdd0b687 100644 --- a/ext/standard/tests/strings/sscanf_basic6.phpt +++ b/ext/standard/tests/strings/sscanf_basic6.phpt @@ -19,15 +19,15 @@ echo "*** Testing sscanf() : basic functionality - using unsigned format ***\n"; $str = "-11 +11 11 -11.234 +11.234 11.234"; $format = "%u %u %u %u %u %u"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic7.phpt b/ext/standard/tests/strings/sscanf_basic7.phpt index 253dd1ba53..1d54054d4b 100644 --- a/ext/standard/tests/strings/sscanf_basic7.phpt +++ b/ext/standard/tests/strings/sscanf_basic7.phpt @@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using octal format ***\n"; $str = "0123 -0123 +0123 0129 -0129 +0129"; $format = "%o %o %o %o %o %o"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt index bcec81eab4..4773f026af 100644 --- a/ext/standard/tests/strings/sscanf_basic8.phpt +++ b/ext/standard/tests/strings/sscanf_basic8.phpt @@ -14,19 +14,19 @@ $str = "129 12F 123B -123B 01ABC 1G"; $format1 = "%x %x %x %x %x %x"; $format2 = "%X %X %X %X %X %X"; -echo "\n-- Try sccanf() WITHOUT optional args --\n"; +echo "\n-- Try sccanf() WITHOUT optional args --\n"; // extract details using short format list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format1); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format2); var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -echo "\n-- Try sccanf() WITH optional args --\n"; +echo "\n-- Try sccanf() WITH optional args --\n"; // extract details using long format $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); $res = sscanf($str, $format2, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); -var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); ?> ===DONE=== diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index f2a3dcbfec..8d883a1f92 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sscanf() function : error conditions +Test sscanf() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/sscanf_variation1.phpt b/ext/standard/tests/strings/sscanf_variation1.phpt index f5c4664526..9bbf2c8b79 100644 --- a/ext/standard/tests/strings/sscanf_variation1.phpt +++ b/ext/standard/tests/strings/sscanf_variation1.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/sscanf_variation2.phpt b/ext/standard/tests/strings/sscanf_variation2.phpt index 9d2904ff72..ee3a41a7c3 100644 --- a/ext/standard/tests/strings/sscanf_variation2.phpt +++ b/ext/standard/tests/strings/sscanf_variation2.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -32,36 +32,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt index 526b8ac723..b127424dfe 100644 --- a/ext/standard/tests/strings/str_ireplace.phpt +++ b/ext/standard/tests/strings/str_ireplace.phpt @@ -47,7 +47,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt Binary files differindex b44a9517ab..0c0c2026cd 100644 --- a/ext/standard/tests/strings/str_pad.phpt +++ b/ext/standard/tests/strings/str_pad.phpt diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index 26902cdd4a..a630b6ad26 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$input' argu * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$input' +/* Test str_pad() function: with unexpected inputs for '$input' * and expected type for '$pad_length' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt index ed620d07bb..2f082ea7a5 100644 --- a/ext/standard/tests/strings/str_pad_variation2.phpt +++ b/ext/standard/tests/strings/str_pad_variation2.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_length' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -35,36 +35,36 @@ $pad_lengths = array ( 1, -2, 255, - + // float values /*5*/ 10.5, -20.5, 10.12345e2, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); @@ -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..73fd79a8b9 100644 --- a/ext/standard/tests/strings/str_pad_variation3.phpt +++ b/ext/standard/tests/strings/str_pad_variation3.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_string' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_string' +/* Test str_pad() function: with unexpected inputs for '$pad_string' * and expected type for '$input' and '$pad_length' */ @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -36,36 +36,36 @@ $pad_strings = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt index 3574d299b5..e5084b7e9b 100644 --- a/ext/standard/tests/strings/str_pad_variation4.phpt +++ b/ext/standard/tests/strings/str_pad_variation4.phpt @@ -9,7 +9,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_type' a * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_type' +/* Test str_pad() function: with unexpected inputs for '$pad_type' * and expected type for '$input', '$pad_length' and '$pad_string' */ @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } // array with different values for $input @@ -33,43 +33,43 @@ $pad_types = array ( /*1*/ 0, // == STR_PAD_LEFT 1, // == STR_PAD_RIGHT 2, // == STR_PAD_BOTH - -2, + -2, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // string data /*10*/ "abc", "STR_PAD_LEFT", "2", "0x2", "02", - + // array values /*15*/ array(), array(0), array(1, 2), - + // boolean values /*18*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*22*/ NULL, null, - + // objects /*24*/ new sample(), - + // undefined variable /*25*/ @$undefined_var, - + // unset variable /*26*/ @$unset_var ); @@ -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_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt index 8eade37df3..f1f47b932c 100644 --- a/ext/standard/tests/strings/str_pad_variation5.phpt +++ b/ext/standard/tests/strings/str_pad_variation5.phpt @@ -16,7 +16,7 @@ if (getenv("USE_ZEND_ALLOC") === "0") { * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex 54763ddf8b..beb5e805f8 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.phpt b/ext/standard/tests/strings/str_replace.phpt index 7b411abac5..b53ed665d4 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -4,10 +4,10 @@ Test str_replace() function precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ @@ -27,13 +27,13 @@ var_dump( str_replace("long string here", "", "", $count) ); var_dump( $count ); $fp = fopen( __FILE__, "r" ); -$fp_copy = $fp; +$fp_copy = $fp; var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) ); var_dump( $fp_copy ); fclose($fp); echo "\n*** Testing str_replace() with various search values ***"; -$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, +$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); $i = 0; @@ -41,7 +41,7 @@ $i = 0; foreach( $search_arr as $value ) { echo "\n-- Iteration $i --\n"; /* replace the string in array */ - var_dump( str_replace($value, "FOUND", $search_arr, $count) ); + var_dump( str_replace($value, "FOUND", $search_arr, $count) ); var_dump( $count ); $i++; } @@ -52,7 +52,7 @@ $subject = "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\000 ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)"; /* needles in an array to be compared in the string $string */ -$search_str = array ( +$search_str = array ( "Hello, World", 'Hello, World', '!!Hello, World', @@ -97,20 +97,20 @@ for( $i = 0; $i < count($search_str); $i++ ) { var_dump( str_replace($search_str[$i], "FOUND", $subject, $count) ); echo "-- search string has found '$count' times\n"; } - + echo "\n*** Testing Miscelleneous input data ***\n"; -/* If replace has fewer values than search, then an empty +/* If replace has fewer values than search, then an empty string is used for the rest of replacement values */ -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), "aaabb", $count ) ); var_dump($count); -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), - array("aaa", "bbb", "ccc"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), + array("aaa", "bbb", "ccc"), $count ) ); @@ -122,7 +122,7 @@ echo "\n-- Testing objects --\n"; to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ -class subject +class subject { function __toString() { return "Hello, world"; @@ -130,7 +130,7 @@ class subject } $obj_subject = new subject; -class search +class search { function __toString() { return "Hello, world"; @@ -138,7 +138,7 @@ class search } $obj_search = new search; -class replace +class replace { function __toString() { return "Hello, world"; @@ -155,15 +155,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count)); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), + array("q", "q", "c"), "aaa", $count ) ); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), - array("aaa", "bbb"), + array("q", "q", "c"), + array("aaa", "bbb"), $count ) ); @@ -182,7 +182,7 @@ var_dump($count); echo "\n-- Testing Resources --\n"; $resource1 = fopen( __FILE__, "r" ); $resource2 = opendir( "." ); -var_dump(str_replace("stream", "FOUND", $resource1, $count)); +var_dump(str_replace("stream", "FOUND", $resource1, $count)); var_dump($count); var_dump(str_replace("stream", "FOUND", $resource2, $count)); var_dump($count); @@ -237,7 +237,7 @@ closedir($resource2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" 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 788c738344..2050711493 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -22,6 +22,6 @@ $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_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index 790a32fffd..10bf542342 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -4,10 +4,10 @@ Test str_replace() function basic function precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ @@ -27,14 +27,14 @@ var_dump( str_replace("long string here", "", "", $count) ); var_dump( $count ); $fp = fopen( __FILE__, "r" ); -$fp_copy = $fp; +$fp_copy = $fp; var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) ); var_dump( $fp_copy ); fclose($fp); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index b66fd8c9ec..9fafc57a39 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -4,10 +4,10 @@ Test str_replace() function error conditions precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ @@ -22,7 +22,7 @@ var_dump( str_replace(1,2,3,$var,5) ); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing str_replace error conditions *** Warning: str_replace() expects at least 3 parameters, 0 given in %sstr_replace_error.php on line 12 NULL diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt index 067e26307d..279fb2201f 100644 --- a/ext/standard/tests/strings/str_replace_variation1.phpt +++ b/ext/standard/tests/strings/str_replace_variation1.phpt @@ -4,16 +4,16 @@ Test str_replace() function - test search values precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ echo "\n*** Testing str_replace() with various search values ***"; -$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, +$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); $i = 0; @@ -21,14 +21,14 @@ $i = 0; foreach( $search_arr as $value ) { echo "\n-- Iteration $i --\n"; /* replace the string in array */ - var_dump( str_replace($value, "FOUND", $search_arr, $count) ); + var_dump( str_replace($value, "FOUND", $search_arr, $count) ); var_dump( $count ); $i++; } ?> ===DONE=== ---EXPECT-- +--EXPECT-- *** Testing str_replace() with various search values *** -- Iteration 0 -- array(12) { diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex 5cf7f7c014..5534341dcf 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 8ae709745f..8f6f38f1f9 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -4,26 +4,26 @@ Test str_replace() function precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ echo "\n*** Testing Miscelleneous input data ***\n"; -/* If replace has fewer values than search, then an empty +/* If replace has fewer values than search, then an empty string is used for the rest of replacement values */ -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), "aaabb", $count ) ); var_dump($count); -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), - array("aaa", "bbb", "ccc"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), + array("aaa", "bbb", "ccc"), $count ) ); @@ -35,7 +35,7 @@ echo "\n-- Testing objects --\n"; to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ -class subject +class subject { function __toString() { return "Hello, world"; @@ -43,7 +43,7 @@ class subject } $obj_subject = new subject; -class search +class search { function __toString() { return "Hello, world"; @@ -51,7 +51,7 @@ class search } $obj_search = new search; -class replace +class replace { function __toString() { return "Hello, world"; @@ -68,15 +68,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count)); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), + array("q", "q", "c"), "aaa", $count ) ); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), - array("aaa", "bbb"), + array("q", "q", "c"), + array("aaa", "bbb"), $count ) ); @@ -95,7 +95,7 @@ var_dump($count); echo "\n-- Testing Resources --\n"; $resource1 = fopen( __FILE__, "r" ); $resource2 = opendir( "." ); -var_dump(str_replace("stream", "FOUND", $resource1, $count)); +var_dump(str_replace("stream", "FOUND", $resource1, $count)); var_dump($count); var_dump(str_replace("stream", "FOUND", $resource2, $count)); var_dump($count); @@ -142,7 +142,7 @@ closedir($resource2); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- *** Testing Miscelleneous input data *** string(3) "qqq" int(5) diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index c43e6f289f..696d380932 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -14,16 +14,16 @@ var_dump(str_rot13("abcdefghijklmnopqrstuvwxyz")); echo "\nEnsure numeric characters are left untouched\n"; if (strcmp(str_rot13("0123456789"), "0123456789") == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure non-alphabetic characters are left untouched\n"; if (strcmp(str_rot13("!%^&*()_-+={}[]:;@~#<,>.?"), "!%^&*()_-+={}[]:;@~#<,>.?")) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } echo "\nEnsure strings round trip\n"; @@ -31,13 +31,13 @@ $str = "str_rot13() tests starting"; $encode = str_rot13($str); $decode = str_rot13($encode); if (strcmp($str, $decode) == 0) { - echo "Strings equal : TEST PASSED\n"; + echo "Strings equal : TEST PASSED\n"; } else { - echo "Strings unequal : TEST FAILED\n"; + echo "Strings unequal : TEST FAILED\n"; } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing str_rot13() : basic functionality *** Basic tests diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index 348f1bb731..b60a35f560 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test str_shuffle() function : basic functionality +Test str_shuffle() function : basic functionality --FILE-- <?php /* Prototype : string str_shuffle ( string $str ) @@ -19,7 +19,7 @@ var_dump(str_shuffle($str)); // For a given i/p string ensure that all combinations are -// generated given a reasonable sample of calls +// generated given a reasonable sample of calls $a = array(); $trys = 1000; $ip = 'abcd'; @@ -27,17 +27,17 @@ $len_ip = strlen($ip); for ($i = 0; $i < $trys; $i++) { $op = str_shuffle($ip); - + if (!is_string($op) || strlen($op) != $len_ip) { - echo "TEST FAILED\n"; - } - + echo "TEST FAILED\n"; + } + // Combination already hit ? if (empty($a[$op])) { - // No first time init + // No first time init $a[$op] = 0; } - + // Increment count for this combination $a[$op]++; } diff --git a/ext/standard/tests/strings/str_shuffle_error.phpt b/ext/standard/tests/strings/str_shuffle_error.phpt index 8b83b5e2d0..d8024290e0 100644 --- a/ext/standard/tests/strings/str_shuffle_error.phpt +++ b/ext/standard/tests/strings/str_shuffle_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test str_shuffle() function : error conditions +Test str_shuffle() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt index b4e9f3f135..5c9f5fc13b 100644 --- a/ext/standard/tests/strings/str_shuffle_variation1.phpt +++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt index 3c7ddaa776..72617cea9e 100644 --- a/ext/standard/tests/strings/str_split_basic.phpt +++ b/ext/standard/tests/strings/str_split_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : basic functionality +Test str_split() function : basic functionality --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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_error.phpt b/ext/standard/tests/strings/str_split_error.phpt index 1a4558e680..c7075ec0ce 100644 --- a/ext/standard/tests/strings/str_split_error.phpt +++ b/ext/standard/tests/strings/str_split_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : error conditions +Test str_split() function : error conditions --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation1.phpt b/ext/standard/tests/strings/str_split_variation1.phpt index 94eca406fd..46406f56a0 100644 --- a/ext/standard/tests/strings/str_split_variation1.phpt +++ b/ext/standard/tests/strings/str_split_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : usage variations - unexpected values for 'str' argument +Test str_split() function : usage variations - unexpected values for 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt index 2ac629530f..ef2ea94a9e 100644 --- a/ext/standard/tests/strings/str_split_variation2.phpt +++ b/ext/standard/tests/strings/str_split_variation2.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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..d465e355d6 100644 --- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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..cbdad94854 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..e06c7025d6 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : usage variations - different single quoted strings for 'str' argument +Test str_split() function : usage variations - different single quoted strings for 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -28,7 +28,7 @@ $values = array( 'simple string', //regular string 'It\'s string with quote', //string containing single quote 'string\tcontains\rwhite space\nchars', - 'containing @ # $ % ^ & chars', + 'containing @ # $ % ^ & chars', 'with 1234 numbers', 'with \0 and ".chr(0)."null chars', //for binary safe 'with multiple space char', @@ -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 d7def41e34..3f8e640f89 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -1,18 +1,18 @@ --TEST-- -Test str_split() function : usage variations - different heredoc strings as 'str' argument +Test str_split() function : usage variations - different heredoc strings as 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length] ) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ /* -* Passing different heredoc strings as 'str' argument to the str_split() -* with 'split_length' 10 +* Passing different heredoc strings as 'str' argument to the str_split() +* with 'split_length' 10 */ echo "*** Testing str_split() : heredoc strings as 'str' argument ***\n"; @@ -83,10 +83,10 @@ foreach($heredoc_array as $str) { var_dump( str_split($str, $split_length) ); $count++; }; - + 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..95afb24e59 100644 --- a/ext/standard/tests/strings/str_split_variation6.phpt +++ b/ext/standard/tests/strings/str_split_variation6.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n //Initialise variables $str = 'This is a string with 123 & escape char \t'; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, @@ -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_variation6_64bit.phpt b/ext/standard/tests/strings/str_split_variation6_64bit.phpt index 583c7db3cf..39c3a85f0d 100644 --- a/ext/standard/tests/strings/str_split_variation6_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation6_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n //Initialise variables $str = 'This is a string with 123 & escape char \t'; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt index a110ea125c..0d34317245 100644 --- a/ext/standard/tests/strings/str_split_variation7.phpt +++ b/ext/standard/tests/strings/str_split_variation7.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -24,7 +24,7 @@ $str = <<<EOT string with 123,escape char \t. EOT; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, @@ -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_split_variation7_64bit.phpt b/ext/standard/tests/strings/str_split_variation7_64bit.phpt index bff61adb30..1f324b2421 100644 --- a/ext/standard/tests/strings/str_split_variation7_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation7_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -24,7 +24,7 @@ $str = <<<EOT string with 123,escape char \t. EOT; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt index c99d9a3ebd..a0496cc2cf 100644 --- a/ext/standard/tests/strings/str_word_count.phpt +++ b/ext/standard/tests/strings/str_word_count.phpt @@ -5,11 +5,11 @@ str_word_count() error_reporting(E_ALL); $str = "Hello friend, you're looking good today!"; -$b =& $str; +$b =& $str; var_dump(str_word_count($str, 1)); var_dump(str_word_count($str, 2)); var_dump(str_word_count($str)); -var_dump(str_word_count($str, 3)); +var_dump(str_word_count($str, 3)); var_dump(str_word_count($str, 123)); var_dump(str_word_count($str, -1)); var_dump(str_word_count($str, 999999999)); @@ -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/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt index e942a17385..5f49fcfbf3 100644 --- a/ext/standard/tests/strings/str_word_count1.phpt +++ b/ext/standard/tests/strings/str_word_count1.phpt @@ -10,7 +10,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- int(0) Warning: str_word_count(): Invalid format value -1 in %s on line %d diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt Binary files differindex 9b1898fb35..265b8708ea 100644 --- a/ext/standard/tests/strings/strcasecmp.phpt +++ b/ext/standard/tests/strings/strcasecmp.phpt diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt Binary files differindex ef659014a5..dea94644aa 100644 --- a/ext/standard/tests/strings/strcmp.phpt +++ b/ext/standard/tests/strings/strcmp.phpt 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 6fbfa04a1c..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 @@ -18,4 +20,3 @@ if($result > 0) { ?> --EXPECT-- Pass - diff --git a/ext/standard/tests/strings/strcoll_error.phpt b/ext/standard/tests/strings/strcoll_error.phpt index 8c17e65fc9..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 ) @@ -41,4 +43,4 @@ NULL Warning: strcoll() expects exactly 2 parameters, 3 given in %s on line %d NULL -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index d9b56f2436..7ed9847edf 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strcspn() function : basic functionality +Test strcspn() function : basic functionality --FILE-- <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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_error.phpt b/ext/standard/tests/strings/strcspn_error.phpt index ebb7f9f0d0..03b4f2d2cf 100644 --- a/ext/standard/tests/strings/strcspn_error.phpt +++ b/ext/standard/tests/strings/strcspn_error.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strcspn() function : error conditions +Test strcspn() function : error conditions --FILE-- <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation1.phpt b/ext/standard/tests/strings/strcspn_variation1.phpt index 81bd018a8a..219a12c4bf 100644 --- a/ext/standard/tests/strings/strcspn_variation1.phpt +++ b/ext/standard/tests/strings/strcspn_variation1.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for str argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 218a02f16f..c82d9970fa 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying mask & default start a <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -49,7 +49,7 @@ $mask_array = array( " \t", "\t\i\100\xa" ); - + // loop through each element of the array for mask argument $count = 1; @@ -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 277ccaa1ce..f970f6e3e9 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and default len <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -61,7 +61,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str,mask and start arguments $count = 1; @@ -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 44723f1381..f187788d94 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and len args <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -50,7 +50,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648 // min negative integer ); - + //defining array of len values $len_array = array( 0, @@ -60,7 +60,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648 // min negative integer ); - + // loop through each element of the arrays for str,mask,start and len arguments @@ -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_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt index 4935cf4b30..c21af6f256 100644 --- a/ext/standard/tests/strings/strcspn_variation2.phpt +++ b/ext/standard/tests/strings/strcspn_variation2.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for mask argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt index 49d7daa2cc..ad09fdbbec 100644 --- a/ext/standard/tests/strings/strcspn_variation3.phpt +++ b/ext/standard/tests/strings/strcspn_variation3.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values of start argument <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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
\ No newline at end of file diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt index 1f84a38cfe..d7c6750233 100644 --- a/ext/standard/tests/strings/strcspn_variation4.phpt +++ b/ext/standard/tests/strings/strcspn_variation4.phpt @@ -6,7 +6,7 @@ Test strcspn() function : usage variations - unexpected values of len argument <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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..9b40bad2d7 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..712f139c55 100644 --- a/ext/standard/tests/strings/strcspn_variation6.phpt +++ b/ext/standard/tests/strings/strcspn_variation6.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying mask <?php /* Prototype : proto int strcspn(string str, string mask [,int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -73,7 +73,7 @@ $mask_array = array( " \t", "\t\i\100\xaa" ); - + // loop through each element of the arrays for string and mask arguments @@ -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 1fc1a2cea4..3c32fee7de 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strcspn(string str, string mask [, int start [,int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -86,7 +86,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str, mask and start arguments @@ -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 0d861c0012..fff6e1ab0c 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters not found in mask. - If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) + If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -80,7 +80,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining array of len values $len_array = array( 0, @@ -90,7 +90,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for all arguments @@ -100,7 +100,7 @@ foreach($heredoc_strings as $str) { foreach($mask_array as $mask) { foreach($start_array as $start) { foreach($len_array as $len) { - var_dump( strcspn($str,$mask,$start,$len) ); + var_dump( strcspn($str,$mask,$start,$len) ); } } } @@ -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..d235dc4d19 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..d6d5d6e479 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -5,13 +5,13 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ echo "*** Testing strip_tags() : basic functionality ***\n"; -// array of arguments +// array of arguments $string_array = array ( "<html>hello</html>", '<html>hello</html>', @@ -28,8 +28,8 @@ $string_array = array ( "<html><!-- COMMENT --></html>", '<html><!-- COMMENT --></html>' ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; @@ -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_error.phpt b/ext/standard/tests/strings/strip_tags_error.phpt index 25f703c3c0..c45cbb115a 100644 --- a/ext/standard/tests/strings/strip_tags_error.phpt +++ b/ext/standard/tests/strings/strip_tags_error.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt index 5c7fd642ad..56c8c28850 100644 --- a/ext/standard/tests/strings/strip_tags_variation1.phpt +++ b/ext/standard/tests/strings/strip_tags_variation1.phpt @@ -5,7 +5,7 @@ set short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ @@ -37,44 +37,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new classA(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource variable /*26*/ $fp 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..e592166d5f 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -7,15 +7,15 @@ short_open_tag = on echo "*** Testing strip_tags() : obscure functionality ***\n"; -// array of arguments +// array of arguments $string_array = array ( 'hello <img title="<"> world', 'hello <img title=">"> world', 'hello <img title=">_<"> world', "hello <img title='>_<'> world" ); - - + + // Calling strip_tags() with default arguments // loop through the $string_array to test strip_tags on various inputs $iteration = 1; @@ -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_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt index a32e3eccad..c0a6e92423 100644 --- a/ext/standard/tests/strings/strip_tags_variation2.phpt +++ b/ext/standard/tests/strings/strip_tags_variation2.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strip_tags_variation3.phpt b/ext/standard/tests/strings/strip_tags_variation3.phpt index 2117c1306c..5b7c50422e 100644 --- a/ext/standard/tests/strings/strip_tags_variation3.phpt +++ b/ext/standard/tests/strings/strip_tags_variation3.phpt @@ -5,7 +5,7 @@ set short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ 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 20b5693905..de8f3aa962 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/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt index 24a23810d5..af289f7793 100644 --- a/ext/standard/tests/strings/stripcslashes_basic.phpt +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test stripcslashes() function : basic functionality +Test stripcslashes() function : basic functionality --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/stripcslashes_error.phpt b/ext/standard/tests/strings/stripcslashes_error.phpt index 174da56443..78103ec31d 100644 --- a/ext/standard/tests/strings/stripcslashes_error.phpt +++ b/ext/standard/tests/strings/stripcslashes_error.phpt @@ -1,10 +1,10 @@ --TEST-- -Test stripcslashes() function : error conditions +Test stripcslashes() function : error conditions --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt index fe3a786678..a2754c6103 100644 --- a/ext/standard/tests/strings/stripcslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt @@ -1,15 +1,15 @@ --TEST-- -Test stripcslashes() function : usage variations - non-string type argument +Test stripcslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ /* - * Test stripcslashes() with non-string type argument such as int, float, etc + * Test stripcslashes() with non-string type argument such as int, float, etc */ echo "*** Testing stripcslashes() : with non-string type argument ***\n"; @@ -23,7 +23,7 @@ unset($unset_var); class sample { public function __toString() { return "obj'ct"; - } + } } // Defining resource @@ -37,43 +37,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null 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_error.phpt b/ext/standard/tests/strings/stripos_error.phpt index 324014cf6d..c59473046d 100644 --- a/ext/standard/tests/strings/stripos_error.phpt +++ b/ext/standard/tests/strings/stripos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripos() function : error conditions +Test stripos() function : error conditions --FILE-- <?php /* Prototype : int stripos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index ac53cd6139..1494076586 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -70,7 +70,7 @@ $needle = array( "456HEE", //numerics + chars $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { @@ -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..70291c48a3 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - unexpected inputs for 'needle' argu * Source code: ext/standard/string.c */ -/* Test stripos() function with unexpected inputs for 'needle' and - * an expected type of input for 'haystack' argument +/* Test stripos() function with unexpected inputs for 'needle' and + * an expected type of input for 'haystack' argument */ echo "*** Testing stripos() function with unexpected values for needle ***\n"; @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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..d4fa84a613 100644 --- a/ext/standard/tests/strings/stripos_variation11.phpt +++ b/ext/standard/tests/strings/stripos_variation11.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( @@ -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..1e09b044ca 100644 --- a/ext/standard/tests/strings/stripos_variation12.phpt +++ b/ext/standard/tests/strings/stripos_variation12.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'haysta * Source code: ext/standard/string.c */ -/* Test stripos() function with null terminated strings for 'haystack' argument - * in order to check the binary safe +/* Test stripos() function with null terminated strings for 'haystack' argument + * in order to check the binary safe */ echo "*** Test stripos() function: binary safe ***\n"; @@ -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..694827051f 100644 --- a/ext/standard/tests/strings/stripos_variation13.phpt +++ b/ext/standard/tests/strings/stripos_variation13.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'needle * Source code: ext/standard/string.c */ -/* Test stripos() function with null terminated strings for 'needle' argument - * in order to check binary safe +/* Test stripos() function with null terminated strings for 'needle' argument + * in order to check binary safe */ echo "*** Test stripos() function: binary safe ***\n"; @@ -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..ecf9d47502 100644 --- a/ext/standard/tests/strings/stripos_variation14.phpt +++ b/ext/standard/tests/strings/stripos_variation14.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); //definition of input args $haystack = "hello world"; @@ -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..819baf08c4 100644 --- a/ext/standard/tests/strings/stripos_variation15.phpt +++ b/ext/standard/tests/strings/stripos_variation15.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( @@ -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..fc678a7267 100644 --- a/ext/standard/tests/strings/stripos_variation3.phpt +++ b/ext/standard/tests/strings/stripos_variation3.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - multi line heredoc string for 'hays * Source code: ext/standard/string.c */ -/* Test stripos() function by passing multi-line heredoc string for haystack and +/* Test stripos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ @@ -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..5c4028ec45 100644 --- a/ext/standard/tests/strings/stripos_variation4.phpt +++ b/ext/standard/tests/strings/stripos_variation4.phpt @@ -8,7 +8,7 @@ Test stripos() function : usage variations - heredoc string containing special c */ /* Test stripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing stripos() function: with heredoc strings ***\n"; @@ -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..8cfc3f9194 100644 --- a/ext/standard/tests/strings/stripos_variation5.phpt +++ b/ext/standard/tests/strings/stripos_variation5.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - heredoc string containing escape ch * Source code: ext/standard/string.c */ -/* Test stripos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test stripos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing stripos() function: with heredoc strings ***\n"; @@ -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..151b145229 100644 --- a/ext/standard/tests/strings/stripos_variation6.phpt +++ b/ext/standard/tests/strings/stripos_variation6.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - heredoc string containing quotes fo * Source code: ext/standard/string.c */ -/* Test stripos() function by passing heredoc string containing quotes for haystack +/* Test stripos() function by passing heredoc string containing quotes for haystack * and with various needles & offsets */ @@ -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_variation7.phpt b/ext/standard/tests/strings/stripos_variation7.phpt index 04c636365f..29a0a20469 100644 --- a/ext/standard/tests/strings/stripos_variation7.phpt +++ b/ext/standard/tests/strings/stripos_variation7.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - empty heredoc string for 'haystack' * Source code: ext/standard/string.c */ -/* Test stripos() function by passing empty heredoc string for haystack +/* Test stripos() function by passing empty heredoc string for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt index cc20e36d23..a0ae75dd1f 100644 --- a/ext/standard/tests/strings/stripos_variation8.phpt +++ b/ext/standard/tests/strings/stripos_variation8.phpt @@ -8,7 +8,7 @@ Test stripos() function : usage variations - repetitive chars for 'haystack' arg */ /* Test stripos() function with strings containing repetitive chars for haystak - * and with various needles & offsets + * and with various needles & offsets */ echo "*** Testing stripos() function: strings repetitive chars ***\n"; @@ -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..8f44e2fcfd 100644 --- a/ext/standard/tests/strings/stripos_variation9.phpt +++ b/ext/standard/tests/strings/stripos_variation9.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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 df49a5116c..c7027e932f 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_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt index 81b9889fc4..99d877fd69 100644 --- a/ext/standard/tests/strings/stripslashes_error.phpt +++ b/ext/standard/tests/strings/stripslashes_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripslashes() function : error conditions +Test stripslashes() function : error conditions --FILE-- <?php /* Prototype : string stripslashes ( string $str ) diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt index 2f9239ceee..fb104199bd 100644 --- a/ext/standard/tests/strings/stripslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripslashes_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripslashes() function : usage variations - non-string type argument +Test stripslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string stripslashes ( string $str ) @@ -8,7 +8,7 @@ Test stripslashes() function : usage variations - non-string type argument */ /* - * Test stripslashes() with non-string type argument such as int, float, etc + * Test stripslashes() with non-string type argument such as int, float, etc */ echo "*** Testing stripslashes() : with non-string type argument ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "obj\'ct"; - } + } } // Defining resource @@ -36,43 +36,43 @@ $values = array ( 1, 12345, -2345, - + // float values /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array values /*10*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*15*/ true, false, TRUE, FALSE, - + // empty string /*19*/ "", '', - + // undefined variable /*21*/ $undefined_var, - + // unset variable /*22*/ $unset_var, - + // objects /*23*/ new sample(), - + // resource /*24*/ $file_handle, - + // null values /*25*/ NULL, null diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt Binary files differindex 71cde1bc31..c3c58f9c42 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..830d798c4a 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -25,7 +25,7 @@ This is line 2 \tof "heredoc" string EOT; // initialising the string array -$str_array = array( +$str_array = array( // string with newline character "\n", "\\n", @@ -36,7 +36,7 @@ $str_array = array( 'Hello \nworld', 'Hello \\nworld', $heredoc_string_with_newline, - + // string with tab character "\t", "\\t", @@ -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..d78076e22c 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -15,7 +15,7 @@ echo "*** Testing stripslashes() : with double dimensional arrays ***\n"; // initialising the string array -$str_array = array( +$str_array = array( array("", array()), array("", array("")), array("f\\'oo", "b\\'ar", array("fo\\'o", "b\\'ar")), @@ -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..274438a86e 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stristr() function : basic functionality +Test stristr() function : basic functionality --FILE-- <?php /* Prototype: string stristr ( string $haystack , mixed $needle [, bool $before_needle ] ) @@ -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_error.phpt b/ext/standard/tests/strings/stristr_error.phpt index a0057574f9..2da35de735 100644 --- a/ext/standard/tests/strings/stristr_error.phpt +++ b/ext/standard/tests/strings/stristr_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stristr() function : error conditions +Test stristr() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/stristr_variation1.phpt b/ext/standard/tests/strings/stristr_variation1.phpt index 2d1844cb31..f1e78bc4bd 100644 --- a/ext/standard/tests/strings/stristr_variation1.phpt +++ b/ext/standard/tests/strings/stristr_variation1.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( 1, -2, -PHP_INT_MAX, - + // float values /*5*/ 10.5, -20.5, 10.1234567e10, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt index 8b4b2c45e9..644fe24b10 100644 --- a/ext/standard/tests/strings/stristr_variation2.phpt +++ b/ext/standard/tests/strings/stristr_variation2.phpt @@ -17,7 +17,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -31,36 +31,36 @@ $inputs = array ( 1, -2, -PHP_INT_MAX, - + // float values /*5*/ 10.5, -20.5, 10.1234567e10, - + // array values /*8*/ array(), array(0), array(1, 2), - + // boolean values /*11*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*15*/ NULL, null, - + // objects /*17*/ new sample(), - + // resource /*18*/ $file_handle, - + // undefined variable /*19*/ @$undefined_var, - + // unset variable /*20*/ @$unset_var ); @@ -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.phpt b/ext/standard/tests/strings/strlen.phpt Binary files differindex 8e6f857b74..52e0200af1 100644 --- a/ext/standard/tests/strings/strlen.phpt +++ b/ext/standard/tests/strings/strlen.phpt diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index ba5da3930d..9e2605a670 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strlen() function : basic functionality +Test strlen() function : basic functionality --FILE-- <?php @@ -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/strlen_error.phpt b/ext/standard/tests/strings/strlen_error.phpt index d893936de3..552e7c1ca6 100644 --- a/ext/standard/tests/strings/strlen_error.phpt +++ b/ext/standard/tests/strings/strlen_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strlen() function : error conditions +Test strlen() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/strlen_variation1.phpt b/ext/standard/tests/strings/strlen_variation1.phpt index f1d6b6b978..9ba138e57c 100644 --- a/ext/standard/tests/strings/strlen_variation1.phpt +++ b/ext/standard/tests/strings/strlen_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,36 +33,36 @@ $inputs = array ( -2, 2147483647, -2147483648, - + // float values /*6*/ 10.5, -20.5, 10.1234567e10, - + // array values /*9*/ array(), array(0), array(1, 2), - + // boolean values /*12*/ true, false, TRUE, FALSE, - + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strnatcasecmp_basic.phpt b/ext/standard/tests/strings/strnatcasecmp_basic.phpt index 5b58e2331e..d385c1958a 100644 --- a/ext/standard/tests/strings/strnatcasecmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_basic.phpt @@ -1,13 +1,13 @@ --TEST-- -Test strnatcasecmp() function : basic functionality +Test strnatcasecmp() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- <?php /* Prototype : int strnatcasecmp(string s1, string s2) - * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm + * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ function str_dump($one, $two) { diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt index 2105904aac..3085e8d8fd 100644 --- a/ext/standard/tests/strings/strnatcasecmp_error.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strnatcasecmp() function : error conditions +Test strnatcasecmp() function : error conditions --FILE-- <?php /* Prototype : int strnatcasecmp ( string $str1 , string $str2 ) diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index ac2cbb69f9..e74f6b73e9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -1,13 +1,13 @@ --TEST-- -Test strnatcasecmp() function : variation +Test strnatcasecmp() function : variation --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- <?php /* Prototype : int strnatcasecmp(string s1, string s2) - * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm + * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ /* Preparation */ diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt index c80a8e062e..bef01de653 100644 --- a/ext/standard/tests/strings/strnatcmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcmp_basic.phpt @@ -34,7 +34,7 @@ var_dump(strnatcmp($d1, $c2)); echo "Equal too tests\n"; var_dump(strnatcmp($b1, $b1)); -var_dump(strnatcmp($b1, $b2)); +var_dump(strnatcmp($b1, $b2)); echo "Greater than tests\n"; var_dump(strnatcmp($b1, $a1)); diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt new file mode 100644 index 0000000000..fde2f164b9 --- /dev/null +++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt @@ -0,0 +1,29 @@ +--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_basic.phpt b/ext/standard/tests/strings/strncasecmp_basic.phpt index c021483359..34a1b08dc4 100644 --- a/ext/standard/tests/strings/strncasecmp_basic.phpt +++ b/ext/standard/tests/strings/strncasecmp_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncasecmp() function : basic functionality +Test strncasecmp() function : basic functionality --FILE-- <?php /* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncasecmp_error.phpt b/ext/standard/tests/strings/strncasecmp_error.phpt index d443f8113b..7b2d19e616 100644 --- a/ext/standard/tests/strings/strncasecmp_error.phpt +++ b/ext/standard/tests/strings/strncasecmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncasecmp() function : error conditions +Test strncasecmp() function : error conditions --FILE-- <?php /* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); 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_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt index 1c5708ae69..adc9253964 100644 --- a/ext/standard/tests/strings/strncasecmp_variation10.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt index 362bbf1167..03cc837077 100644 --- a/ext/standard/tests/strings/strncasecmp_variation11.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt index bf7c765a1d..5db892cfa1 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_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index 93968db2da..9d46db9ee1 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() 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_variation8.phpt b/ext/standard/tests/strings/strncasecmp_variation8.phpt index 680653af90..6011a7b0fd 100644 --- a/ext/standard/tests/strings/strncasecmp_variation8.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncasecmp() function: usage variations - single quoted strings --FILE-- <?php -/* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); +/* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); * Description: Binary safe case-insensitive string comparison of the first n characters * Source code: Zend/zend_builtin_functions.c */ 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_basic.phpt b/ext/standard/tests/strings/strncmp_basic.phpt index a836e591a5..317039859f 100644 --- a/ext/standard/tests/strings/strncmp_basic.phpt +++ b/ext/standard/tests/strings/strncmp_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function : basic functionality +Test strncmp() function : basic functionality --FILE-- <?php /* Prototype : int strncmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncmp_error.phpt b/ext/standard/tests/strings/strncmp_error.phpt index 4eb73eb318..8e4d2805eb 100644 --- a/ext/standard/tests/strings/strncmp_error.phpt +++ b/ext/standard/tests/strings/strncmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function : error conditions +Test strncmp() function : error conditions --FILE-- <?php /* Prototype : int strncmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncmp_variation1.phpt b/ext/standard/tests/strings/strncmp_variation1.phpt index 7bc91784b3..2fc3c3d4c7 100644 --- a/ext/standard/tests/strings/strncmp_variation1.phpt +++ b/ext/standard/tests/strings/strncmp_variation1.phpt @@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) { } echo "*** Done ***"; ?> ---EXPECTREGEX-- +--EXPECTREGEX-- \*\*\* Test strncmp\(\) function: with alphabets \*\*\* -- Passing upper-case letters for 'str1' -- int\(0\) diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 5e96e5d16f..84684ea551 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -32,7 +32,7 @@ $values = array ( 1, 12345, -2345, - + /* float values */ 10.5, -10.5, @@ -43,7 +43,7 @@ $values = array ( /* hexadecimal values */ 0x12, -0x12, - + /* octal values */ 012, -012, @@ -77,7 +77,7 @@ $values = array ( $unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() 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..e34d42cefc 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -25,14 +25,14 @@ for($ASCII = 0; $ASCII <= 255; $ASCII++) { } echo "\n-- Checking with out of character's range, given in binary format --\n"; -/* Checking with the out of range ASCII value(given in binary format) */ +/* Checking with the out of range ASCII value(given in binary format) */ $str1 = decbin(256); $str2 = decbin( ord( chr(256) )); var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int(1) 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_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt index 9d8c841d68..bc000d171e 100644 --- a/ext/standard/tests/strings/strncmp_variation8.phpt +++ b/ext/standard/tests/strings/strncmp_variation8.phpt @@ -2,7 +2,7 @@ Test strncmp() function: usage variations - single quoted strings --FILE-- <?php -/* Prototype : int strncmp ( string $str1, string $str2, int $len ); +/* Prototype : int strncmp ( string $str1, string $str2, int $len ); * Description: Binary safe case-sensitive string comparison of the first n characters * Source code: Zend/zend_builtin_functions.c */ 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/strpbrk_basic.phpt b/ext/standard/tests/strings/strpbrk_basic.phpt index 9a92b8b4b5..23d59c2ff4 100644 --- a/ext/standard/tests/strings/strpbrk_basic.phpt +++ b/ext/standard/tests/strings/strpbrk_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test strpbrk() function : basic functionality +Test strpbrk() function : basic functionality --FILE-- <?php /* Prototype : array strpbrk(string haystack, string char_list) - * Description: Search a string for any of a set of characters + * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strpbrk() : basic functionality ***\n"; diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt index 658e2f429e..85729ea112 100644 --- a/ext/standard/tests/strings/strpbrk_error.phpt +++ b/ext/standard/tests/strings/strpbrk_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test strpbrk() function : error conditions +Test strpbrk() function : error conditions --FILE-- <?php /* Prototype : array strpbrk(string haystack, string char_list) - * Description: Search a string for any of a set of characters + * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing strpbrk() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex d127d9d77c..c9c3453588 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..e98119ad8b 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..5c3be8c121 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrchr() function : basic functionality +Test strrchr() function : basic functionality --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); @@ -10,8 +10,8 @@ Test strrchr() function : basic functionality echo "*** Testing strrchr() function: basic functionality ***\n"; var_dump( strrchr("Hello, World", "H") ); //needle as single char var_dump( strrchr("Hello, World", "Hello") ); //needle as a first word of haystack -var_dump( strrchr('Hello, World', 'H') ); -var_dump( strrchr('Hello, World', 'Hello') ); +var_dump( strrchr('Hello, World', 'H') ); +var_dump( strrchr('Hello, World', 'Hello') ); //considering case var_dump( strrchr("Hello, World", "h") ); @@ -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_error.phpt b/ext/standard/tests/strings/strrchr_error.phpt index de5a9d34de..aa0adf4b85 100644 --- a/ext/standard/tests/strings/strrchr_error.phpt +++ b/ext/standard/tests/strings/strrchr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrchr() function : error conditions +Test strrchr() function : error conditions --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); - * Description: Finds the last occurrence of a character in a string. + * Description: Finds the last occurrence of a character in a string. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 7100f5e824..7a8b3c9756 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..fc69a76b1a 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrchr() function : usage variations - unexpected inputs for needle +Test strrchr() function : usage variations - unexpected inputs for needle --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); @@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for needle * Source code: ext/standard/string.c */ -/* Test strrchr() function: with unexpected inputs for needle - * and expected type for haystack +/* Test strrchr() function: with unexpected inputs for needle + * and expected type for haystack */ echo "*** Testing strrchr() function with unexpected inputs for needle ***\n"; @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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 *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt index 4f1ecd2c1d..b30ecbf242 100644 --- a/ext/standard/tests/strings/strrchr_variation11.phpt +++ b/ext/standard/tests/strings/strrchr_variation11.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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 *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt Binary files differindex c31e0c86ce..7ec5b830ba 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..46d7e99e5f 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -71,7 +71,7 @@ $needle = array( 42, //needle as int(ASCII value of '*') $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { @@ -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,8 +221,10 @@ 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 -- string(63) "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>?@hello123456he \x234 \101 " -*** Done *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index e22efe9e5c..947d613ee2 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -19,20 +19,20 @@ using heredoc syntax. EOD; $needles = array( - "ing", - "", + "ing", + "", " ", - $multi_line_str //needle as haystack + $multi_line_str //needle as haystack ); //loop through to test strrchr() with each needle -foreach($needles as $needle) { +foreach($needles as $needle) { var_dump( strrchr($multi_line_str, $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..8c385e5cb8 100644 --- a/ext/standard/tests/strings/strrchr_variation4.phpt +++ b/ext/standard/tests/strings/strrchr_variation4.phpt @@ -8,7 +8,7 @@ Test strrchr() function : usage variations - heredoc string containing special c */ /* Test strrchr() function by passing heredoc string containing special chars for haystack - * and with various needles + * and with various needles */ echo "*** Testing strrchr() function: with heredoc strings ***\n"; @@ -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..6d768e06bb 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing escape se * Source code: ext/standard/string.c */ -/* Test strrchr() function by passing heredoc string containing +/* Test strrchr() function by passing heredoc string containing * escape sequences for haystack and with various needles */ @@ -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..d60b2e6711 100644 --- a/ext/standard/tests/strings/strrchr_variation7.phpt +++ b/ext/standard/tests/strings/strrchr_variation7.phpt @@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing blank lin * Source code: ext/standard/string.c */ -/* Test strrchr() function by passing heredoc string containing +/* Test strrchr() function by passing heredoc string containing * blank-line for haystack and with various needles */ @@ -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..b1a2e8b33e 100644 --- a/ext/standard/tests/strings/strrchr_variation8.phpt +++ b/ext/standard/tests/strings/strrchr_variation8.phpt @@ -34,8 +34,12 @@ 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) -*** Done *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt index 0c78663c06..4d80825c85 100644 --- a/ext/standard/tests/strings/strrchr_variation9.phpt +++ b/ext/standard/tests/strings/strrchr_variation9.phpt @@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for haystack * Source code: ext/standard/string.c */ -/* Test strrchr() function with unexpected inputs for haystack - * and expected type for 'needle' +/* Test strrchr() function with unexpected inputs for haystack + * and expected type for 'needle' */ echo "*** Testing strrchr() function: with unexpected inputs for haystack ***\n"; @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -56,7 +56,7 @@ $haystacks = array ( TRUE, FALSE, - // null vlaues + // null values NULL, null, @@ -108,7 +108,7 @@ $needles = array ( //empty string "", '', - + //resource variable in string form "\$file_handle", diff --git a/ext/standard/tests/strings/strrev.phpt b/ext/standard/tests/strings/strrev.phpt index 92c66817d9..321aca5bd7 100644 --- a/ext/standard/tests/strings/strrev.phpt +++ b/ext/standard/tests/strings/strrev.phpt @@ -8,7 +8,7 @@ strrev() function while ($i<256) { $str .= chr($i++); } - + var_dump(md5(strrev($str))); var_dump(strrev(NULL)); var_dump(strrev("")); diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt index 377a2d147e..390b78648b 100644 --- a/ext/standard/tests/strings/strrev_basic.phpt +++ b/ext/standard/tests/strings/strrev_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrev() function : basic functionality +Test strrev() function : basic functionality --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ @@ -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_error.phpt b/ext/standard/tests/strings/strrev_error.phpt index 2bc8a228ef..ef64e80afd 100644 --- a/ext/standard/tests/strings/strrev_error.phpt +++ b/ext/standard/tests/strings/strrev_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrev() function : error conditions +Test strrev() function : error conditions --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt Binary files differindex 8fd957777a..ce0588d750 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..87c64ec794 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..af1d276ea6 100644 --- a/ext/standard/tests/strings/strrev_variation3.phpt +++ b/ext/standard/tests/strings/strrev_variation3.phpt diff --git a/ext/standard/tests/strings/strrev_variation4.phpt b/ext/standard/tests/strings/strrev_variation4.phpt index b585035c11..fa347cd2fd 100644 --- a/ext/standard/tests/strings/strrev_variation4.phpt +++ b/ext/standard/tests/strings/strrev_variation4.phpt @@ -3,7 +3,7 @@ Test strrev() function : usage variations - unexpected inputs --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ @@ -17,7 +17,7 @@ class sample { } } -//get the resource +//get the resource $resource = fopen(__FILE__, "r"); //get an unset variable diff --git a/ext/standard/tests/strings/strripos_basic1.phpt b/ext/standard/tests/strings/strripos_basic1.phpt index 70bbdf94e5..759c23114e 100644 --- a/ext/standard/tests/strings/strripos_basic1.phpt +++ b/ext/standard/tests/strings/strripos_basic1.phpt @@ -23,7 +23,7 @@ echo "\n-- single char for needle --\n"; var_dump( strripos("Hello, World", "O") ); var_dump( strripos("Hello, World", ",") ); -echo "\n-- heredoc string for haystack & needle --\n"; +echo "\n-- heredoc string for haystack & needle --\n"; var_dump( strripos($heredoc_str, "Hello, WoRLd") ); var_dump( strripos($heredoc_str, 'HelLO') ); var_dump( strripos($heredoc_str, $heredoc_str) ); diff --git a/ext/standard/tests/strings/strripos_basic2.phpt b/ext/standard/tests/strings/strripos_basic2.phpt index 72d02d5c80..d4a1a73f06 100644 --- a/ext/standard/tests/strings/strripos_basic2.phpt +++ b/ext/standard/tests/strings/strripos_basic2.phpt @@ -12,25 +12,25 @@ $heredoc_str = <<<EOD Hello, World EOD; -echo "\n-- regular string for haystack & needle, with various offsets --\n"; +echo "\n-- regular string for haystack & needle, with various offsets --\n"; var_dump( strripos("Hello, World", "HeLLo", 0) ); var_dump( strripos("Hello, World", 'Hello', 1) ); var_dump( strripos('Hello, World', 'world', 1) ); var_dump( strripos('Hello, World', "WorLD", 5) ); -echo "\n-- heredoc string for haystack & needle, with various offsets --\n"; +echo "\n-- heredoc string for haystack & needle, with various offsets --\n"; var_dump( strripos($heredoc_str, "Hello, WORLD", 0) ); var_dump( strripos($heredoc_str, 'HelLo', 0) ); var_dump( strripos($heredoc_str, 'HeLLo', 1) ); var_dump( strripos($heredoc_str, $heredoc_str, 0) ); var_dump( strripos($heredoc_str, $heredoc_str, 1) ); -echo "\n-- various +ve offsets --\n"; +echo "\n-- various +ve offsets --\n"; var_dump( strripos("Hello, World", "O", 3) ); var_dump( strripos("Hello, World", "O", 6) ); var_dump( strripos("Hello, World", "O", 10) ); -echo "\n-- various -ve offsets --\n"; +echo "\n-- various -ve offsets --\n"; var_dump( strripos("Hello, World", "O", -1) ); var_dump( strripos("Hello, World", "O", -5) ); var_dump( strripos("Hello, World", "O", -9) ); diff --git a/ext/standard/tests/strings/strripos_error.phpt b/ext/standard/tests/strings/strripos_error.phpt index 97445f0c86..59d592681a 100644 --- a/ext/standard/tests/strings/strripos_error.phpt +++ b/ext/standard/tests/strings/strripos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strripos() function : error conditions +Test strripos() function : error conditions --FILE-- <?php /* Prototype : int strripos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt index 4ba98d137f..81e4e2ba8a 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 @@ -17,28 +15,32 @@ 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 +--EXPECTF-- +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..9ba4091633 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -13,55 +13,55 @@ echo "*** Testing strripos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needles = array( //regular strings -/*1*/ "l", +/*1*/ "l", "L", "HELLO", "hEllo", - + //escape characters -/*5*/ "\t", +/*5*/ "\t", "\T", //invalid input " ", "\n", "\N", //invalid input " ", //new line - + //nulls -/*11*/ "\0", +/*11*/ "\0", NULL, null, - + //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, - + //empty string /*16*/ "", - + //special chars -/*17*/ " ", +/*17*/ " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", "@hEllo", - -/*29*/ "12345", //decimal numeric string + +/*29*/ "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; foreach ($needles as $needle) { @@ -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) @@ -251,4 +283,4 @@ int(0) bool(false) bool(false) int(0) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index 529943bddd..1711537d66 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -13,54 +13,54 @@ echo "*** Testing strripos() function: with single quoted strings ***\n"; $haystack = 'Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 '; $needles = array( //regular strings -/*1*/ 'l', +/*1*/ 'l', 'L', 'HELLO', 'hEllo', - + //escape characters -/*5*/ '\t', +/*5*/ '\t', '\T', ' ', '\n', '\N', ' ', //new line - + //nulls -/*11*/ '\0', +/*11*/ '\0', NULL, null, - + //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, - + //empty string /*16*/ '', - + //special chars -/*17*/ ' ', +/*17*/ ' ', '$', ' $', '&', '!#', '()', - '<=>', + '<=>', '>', '=>', '?', '@', '@hEllo', - -/*29*/ '12345', //decimal numeric string + +/*29*/ '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //respective ASCII char of \x23 '\101', //octal numeric string 'A', // respective ASCII char for \101 '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ @@ -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,13 +280,21 @@ 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) bool(false) bool(false) int(0) -===DONE=== +===DONE===
\ No newline at end of file diff --git a/ext/standard/tests/strings/strripos_variation3.phpt b/ext/standard/tests/strings/strripos_variation3.phpt index 4fccaeb47e..c380106341 100644 --- a/ext/standard/tests/strings/strripos_variation3.phpt +++ b/ext/standard/tests/strings/strripos_variation3.phpt @@ -7,7 +7,7 @@ Test strripos() function : usage variations - multi line heredoc string for 'hay * Source code: ext/standard/string.c */ -/* Test strripos() function by passing multi-line heredoc string for haystack and +/* Test strripos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index f76ea41d36..ef872d7c76 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -8,7 +8,7 @@ Test strripos() function : usage variations - heredoc string containing special */ /* Test strripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; @@ -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..7530a9f446 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -7,8 +7,8 @@ Test strripos() function : usage variations - heredoc string containing escape c * Source code: ext/standard/string.c */ -/* Test strripos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strripos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; @@ -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_error.phpt b/ext/standard/tests/strings/strrpos_error.phpt index d97af99920..3900ceaa5d 100644 --- a/ext/standard/tests/strings/strrpos_error.phpt +++ b/ext/standard/tests/strings/strrpos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrpos() function : error conditions +Test strrpos() function : error conditions --FILE-- <?php /* Prototype : int strrpos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt index 18dcf7b850..6ecab108dc 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 @@ -16,25 +14,29 @@ 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 +--EXPECTF-- +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..88da3d8230 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with double quoted strings ***\n"; $haystack = "Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 "; $needle = array( //regular strings - "l", + "l", "L", "HELLO", "hEllo", //escape characters - "\t", + "\t", "\T", //invalid input " ", "\n", @@ -28,40 +28,40 @@ $needle = array( ", //new line //nulls - "\0", + "\0", NULL, null, //boolean false - FALSE, + FALSE, false, //empty string "", //special chars - " ", + " ", "$", " $", "&", - "!#", + "!#", "()", - "<=>", - ">", + "<=>", + ">", "=>", "?", "@", "@hEllo", - "12345", //decimal numeric string + "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); - + /* loop through to get the position of the needle in haystack string */ $count = 1; for($index=0; $index<count($needle); $index++) { @@ -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) @@ -179,4 +195,4 @@ bool(false) -- Iteration 35 -- int(0) bool(false) -*** Done *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index dabfa0d4a8..1fc97ad4bd 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - unexpected inputs for 'needle' argu * Source code: ext/standard/string.c */ -/* Test strrpos() function with unexpected inputs for 'needle' and - * an expected type of input for 'haystack' argument +/* Test strrpos() function with unexpected inputs for 'needle' and + * an expected type of input for 'haystack' argument */ echo "*** Testing strrpos() function with unexpected values for needle ***\n"; @@ -21,7 +21,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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 *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt index de4013b917..a5d24220ea 100644 --- a/ext/standard/tests/strings/strrpos_variation11.phpt +++ b/ext/standard/tests/strings/strrpos_variation11.phpt @@ -19,11 +19,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( @@ -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 *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt index 7517eaa707..b46f2e98ef 100644 --- a/ext/standard/tests/strings/strrpos_variation12.phpt +++ b/ext/standard/tests/strings/strrpos_variation12.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking binary safe with 'haystack * Source code: ext/standard/string.c */ -/* Test strrpos() function with null terminated strings for 'haystack' argument - * in order to check the binary safe +/* Test strrpos() function with null terminated strings for 'haystack' argument + * in order to check the binary safe */ echo "*** Test strrpos() function: binary safe ***\n"; @@ -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..2772a2315a 100644 --- a/ext/standard/tests/strings/strrpos_variation13.phpt +++ b/ext/standard/tests/strings/strrpos_variation13.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking bianry safe with 'needle' * Source code: ext/standard/string.c */ -/* Test strrpos() function with null terminated strings for 'needle' argument - * in order to check binary safe +/* Test strrpos() function with null terminated strings for 'needle' argument + * in order to check binary safe */ echo "*** Test strrpos() function: binary safe ***\n"; @@ -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..a0586db20f 100644 --- a/ext/standard/tests/strings/strrpos_variation14.phpt +++ b/ext/standard/tests/strings/strrpos_variation14.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); //definition of input args $haystack = "hello world"; @@ -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..1b8983ed1f 100644 --- a/ext/standard/tests/strings/strrpos_variation15.phpt +++ b/ext/standard/tests/strings/strrpos_variation15.phpt @@ -21,11 +21,11 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource -$file_handle = fopen(__FILE__, "r"); +$file_handle = fopen(__FILE__, "r"); // array with different values $values = array ( @@ -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..510f92ae0b 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with single quoted strings ***\n"; $haystack = 'Hello,\t\n\0\n $&!#%()*<=>?@hello123456he \x234 \101 '; $needle = array( //regular strings - 'l', + 'l', 'L', 'HELLO', 'hEllo', //escape characters - '\t', + '\t', '\T', ' ', '\n', @@ -28,39 +28,39 @@ $needle = array( ', //new line //nulls - '\0', + '\0', NULL, null, //boolean false - FALSE, + FALSE, false, //empty string '', //special chars - ' ', + ' ', '$', ' $', '&', '!#', '()', - '<=>', + '<=>', '>', '=>', '?', '@', '@hEllo', - '12345', //decimal numeric string + '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //hexadecimal numeric string '\101', //octal numeric string 'A', '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ @@ -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,9 +194,13 @@ 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) bool(false) -*** Done *** +*** Done ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index d37342e464..a920225947 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - multi line heredoc string for 'hays * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing multi-line heredoc string for haystack and +/* Test strrpos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ @@ -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 ed032f264e..40ac17affe 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - heredoc string containing special c */ /* Test strrpos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; @@ -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 b322e97e61..0d985d86b4 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - heredoc string containing escape ch * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strrpos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; @@ -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 f361e8c5ea..ba5c5a1a40 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - heredoc string containing quotes fo * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing quotes for haystack +/* Test strrpos() function by passing heredoc string containing quotes for haystack * and with various needles & offsets */ @@ -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 cf70befdbd..a6318add96 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - empty heredoc string for 'haystack' * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing empty heredoc string for haystack +/* Test strrpos() function by passing empty heredoc string for haystack * and with various needles & offsets */ @@ -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 ***
\ No newline at end of file diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index b5ee760867..d69e49f1d4 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - repetitive chars for 'haystack' arg */ /* Test strrpos() function with strings containing multiple occurrences of 'needle' in the 'haystack' - * and with various needles & offsets + * and with various needles & offsets */ echo "*** Testing strrpos() function: strings repetitive chars ***\n"; @@ -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..04d8f44e8b 100644 --- a/ext/standard/tests/strings/strrpos_variation9.phpt +++ b/ext/standard/tests/strings/strrpos_variation9.phpt @@ -19,7 +19,7 @@ unset($unset_var); class sample { public function __toString() { return "object"; - } + } } //getting the resource @@ -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 8ca2824393..dd43470826 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strspn() function : basic functionality +Test strspn() function : basic functionality --FILE-- <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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_error.phpt b/ext/standard/tests/strings/strspn_error.phpt index 0cf88c25d2..caa1f901a1 100644 --- a/ext/standard/tests/strings/strspn_error.phpt +++ b/ext/standard/tests/strings/strspn_error.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strspn() function : error conditions +Test strspn() function : error conditions --FILE-- <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation1.phpt b/ext/standard/tests/strings/strspn_variation1.phpt index 6b73b212ea..45e71edc28 100644 --- a/ext/standard/tests/strings/strspn_variation1.phpt +++ b/ext/standard/tests/strings/strspn_variation1.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values for str argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index 39911aa8b0..6c87eb01db 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying mask & default start an <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -50,7 +50,7 @@ $mask_array = array( " \t", "fhel\t\i\100\xa" ); - + // loop through each element of the array for mask argument @@ -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 80b3c8e310..8f85e979a7 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and default len a <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -51,7 +51,7 @@ $mask_array = array( "fhel\t\i\100\xa" ); -// defining the array for start values +// defining the array for start values $start_array = array( 0, 1, @@ -61,7 +61,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the arrays for str, mask and start argument $count = 1; @@ -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 ebb0013720..df353ec040 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and len args <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -42,7 +42,7 @@ $mask_array = array( "fhel\t\i\100\xa" ); -// defining the array for start values +// defining the array for start values $start_array = array( 0, 1, @@ -51,7 +51,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining an array of len values $len_array = array( 0, @@ -61,7 +61,7 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for len argument $count = 1; @@ -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_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt index b968ce1436..57929fa352 100644 --- a/ext/standard/tests/strings/strspn_variation2.phpt +++ b/ext/standard/tests/strings/strspn_variation2.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values for mask argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt index 7cc06d10be..db1a51abf4 100644 --- a/ext/standard/tests/strings/strspn_variation3.phpt +++ b/ext/standard/tests/strings/strspn_variation3.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of start argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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
\ No newline at end of file diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt index f81dbae64e..74c7db421b 100644 --- a/ext/standard/tests/strings/strspn_variation4.phpt +++ b/ext/standard/tests/strings/strspn_variation4.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of len argument <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -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
\ No newline at end of file diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 5b4bf7e108..04ac841ef7 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..3e039909e0 100644 --- a/ext/standard/tests/strings/strspn_variation6.phpt +++ b/ext/standard/tests/strings/strspn_variation6.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying mask & <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -74,7 +74,7 @@ $mask_array = array( "l \te", "lf\the\i\100\xaa" ); - + // loop through each element of the array for different heredoc and mask strings @@ -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 3191376a0b..b3a4dbe7c3 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -85,7 +85,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for heredoc strings, mask strings and start values @@ -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 2e6a6cc3d9..0033aea837 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) * Description: Finds length of initial segment consisting entirely of characters found in mask. - If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) + If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) * Source code: ext/standard/string.c * Alias to functions: none */ @@ -81,7 +81,7 @@ $start_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // defining array of different len values $len_array = array( 0, @@ -91,13 +91,13 @@ $len_array = array( 2147483647, // max positive integer -2147483648, // min negative integer ); - + // loop through each element of the array for heredoc str, mask str , start values and len values $count = 1; -foreach($heredoc_strings as $str) { +foreach($heredoc_strings as $str) { echo "\n-- Iteration $count --\n"; foreach($mask_array as $mask) { foreach($start_array as $start) { @@ -107,11 +107,11 @@ foreach($heredoc_strings as $str) { } } $count++; -}; +}; 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..5ec2330e25 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..f746b03079 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..3cb687295e 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strtok() function : basic functionality +Test strtok() function : basic functionality --FILE-- <?php /* Prototype : string strtok ( str $str, str $token ) @@ -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_error.phpt b/ext/standard/tests/strings/strtok_error.phpt index b54fbbe19b..58044e7b62 100644 --- a/ext/standard/tests/strings/strtok_error.phpt +++ b/ext/standard/tests/strings/strtok_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strtok() function : error conditions +Test strtok() function : error conditions --FILE-- <?php /* Prototype : string strtok ( string $str, string $token ) @@ -26,10 +26,10 @@ $extra_arg = 10; var_dump( strtok($str, $token, $extra_arg) ); var_dump( $str ); -// Less than expected number of arguments +// Less than expected number of arguments echo "\n-- Testing strtok() with less than expected no. of arguments --\n"; $str = 'string val'; - + var_dump( strtok($str)); var_dump( $str ); diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt index 38d4b5ac8b..7f7713c422 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, @@ -94,7 +94,7 @@ for($index = 0; $index < count($values); $index ++) { $counter ++; } -//closing the resource +//closing the resource fclose($file_handle); echo "Done\n"; diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt index 2f88efc0ef..68fec53fb6 100644 --- a/ext/standard/tests/strings/strtok_variation2.phpt +++ b/ext/standard/tests/strings/strtok_variation2.phpt @@ -24,7 +24,7 @@ class sample { public function __toString() { return "obj-ect"; } -} +} // Defining resource $file_handle = fopen(__FILE__, 'r'); @@ -65,7 +65,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -74,7 +74,7 @@ $values = array ( // unset variable $unset_var, - + // resource $file_handle ); 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..699c7a9695 100644 --- a/ext/standard/tests/strings/strtok_variation5.phpt +++ b/ext/standard/tests/strings/strtok_variation5.phpt @@ -27,7 +27,7 @@ $string_array = array( chr(0).'hello'.chr(0), 'hello'.chr(0).'world' ); -$token_array = array( +$token_array = array( "wr", "hello world", "__", @@ -47,17 +47,17 @@ $token_array = array( $counter =1; foreach( $string_array as $string ) { echo "\n--- Iteration $counter ---\n"; - var_dump( strtok($string, $token_array[$counter-1]) ); + var_dump( strtok($string, $token_array[$counter-1]) ); for( $count = 1; $count <=5; $count++ ) { var_dump( strtok($token_array[$counter-1]) ); } $counter++; -} - +} + 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..4b379ec86f 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -20,12 +20,12 @@ $string_array = array( "/khello\k world/k", "/hellok/ world" ); -$token_array = array( +$token_array = array( "k", "/ ", "/k", "\k", - "\\\\\\\k\h\\e\l\o\w\r\l\d" + "\\\\\\\k\h\\e\l\o\w\r\l\d" ); // loop through each element of the array and check the working of strtok() @@ -34,20 +34,20 @@ $token_array = array( $counter =1; foreach( $string_array as $string ) { echo "\n--- Iteration $counter ---\n"; - foreach( $token_array as $token ) { - var_dump( strtok($string, $token) ); + foreach( $token_array as $token ) { + var_dump( strtok($string, $token) ); for( $count = 1; $count <=3; $count++ ) { var_dump( strtok($token) ); } echo "\n"; } $counter++; -} - +} + 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..9a88c93668 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -17,7 +17,7 @@ $str = "this is a sample string"; $token = " "; echo "\n*** Testing strtok() when string being tokenised is prefixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = "extra string ".$str; for( $count = 1; $count <=6; $count++ ) { @@ -25,9 +25,9 @@ for( $count = 1; $count <=6; $count++ ) { var_dump( strtok($token) ); echo "\n-- Input str is \"$str\" --\n"; } - + echo "\n*** Testing strtok() when string being tokenised is suffixed with another string in between the process ***\n"; -var_dump( strtok($str, $token) ); +var_dump( strtok($str, $token) ); // adding a string to the input string which is being tokenised $str = $str." extra string"; for( $count = 1; $count <=10; $count++ ) { @@ -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/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt Binary files differindex c0ad1d0115..ffaa1487ba 100644 --- a/ext/standard/tests/strings/strtolower-win32.phpt +++ b/ext/standard/tests/strings/strtolower-win32.phpt diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt Binary files differindex 47dfe09762..166b5ccc67 100644 --- a/ext/standard/tests/strings/strtolower.phpt +++ b/ext/standard/tests/strings/strtolower.phpt diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt Binary files differindex 60701652e1..e0adc645e0 100644 --- a/ext/standard/tests/strings/strtoupper1-win32.phpt +++ b/ext/standard/tests/strings/strtoupper1-win32.phpt diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt Binary files differindex e0ebf42ea7..b83a8a3a5d 100644 --- a/ext/standard/tests/strings/strtoupper1.phpt +++ b/ext/standard/tests/strings/strtoupper1.phpt diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 633e3f93ef..8f4ccdc326 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -27,7 +27,7 @@ var_dump( strtr('test strtr', 'test', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TEST") ); //$from and $to are of different lengths, extra chars in the longer one are ignored -var_dump( strtr("test strtr", "test", "TESTz") ); +var_dump( strtr("test strtr", "test", "TESTz") ); var_dump( strtr('test strtr', 'testz', 'TEST') ); var_dump( strtr($heredoc_str, "test", "TESTz") ); @@ -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_error.phpt b/ext/standard/tests/strings/strtr_error.phpt index 0d4d157776..f34085fb4d 100644 --- a/ext/standard/tests/strings/strtr_error.phpt +++ b/ext/standard/tests/strings/strtr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strtr() function : error conditions +Test strtr() function : error conditions --FILE-- <?php /* Prototype : string strtr(string str, string from[, string to]) - * Description: Translates characters in str using given translation tables + * Description: Translates characters in str using given translation tables * Source code: ext/standard/string.c */ 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 fe546dc8ce..9feb237645 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..7f398cfe65 100644 --- a/ext/standard/tests/strings/strtr_variation5.phpt +++ b/ext/standard/tests/strings/strtr_variation5.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'str' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'str' - * and expected type for 'from' & 'to' arguments +/* Test strtr() function: with unexpected inputs for 'str' + * and expected type for 'from' & 'to' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'str' ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -35,36 +35,36 @@ $strings = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 9058664030..ba7c72c215 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'from' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'from' - * and expected type for 'str' & 'to' arguments +/* Test strtr() function: with unexpected inputs for 'from' + * and expected type for 'str' & 'to' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'from' ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -38,36 +38,36 @@ $from_arr = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation7.phpt b/ext/standard/tests/strings/strtr_variation7.phpt index 981f56688e..b8d8de7de0 100644 --- a/ext/standard/tests/strings/strtr_variation7.phpt +++ b/ext/standard/tests/strings/strtr_variation7.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'to' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'to' - * and expected types for 'str' & 'from' arguments +/* Test strtr() function: with unexpected inputs for 'to' + * and expected types for 'str' & 'from' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'to' ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -41,36 +41,36 @@ $to_arr = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.12345675e10, - + // array values /*7*/ array(), array(0), array(1, 2), - + // boolean values /*10*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*14*/ NULL, null, - + // objects /*16*/ new sample(), - + // resource /*17*/ $file_handle, - + // undefined variable /*18*/ @$undefined_var, - + // unset variable /*19*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt index 4233a166d7..dd10c814f0 100644 --- a/ext/standard/tests/strings/strtr_variation8.phpt +++ b/ext/standard/tests/strings/strtr_variation8.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'replace_pairs' * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'replace_pairs' - * and expected type for 'str' arguments +/* Test strtr() function: with unexpected inputs for 'replace_pairs' + * and expected type for 'str' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'replace_pairs' ***\n"; @@ -22,7 +22,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -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..107258e2ef 100644 --- a/ext/standard/tests/strings/strtr_variation9.phpt +++ b/ext/standard/tests/strings/strtr_variation9.phpt @@ -20,7 +20,7 @@ unset($unset_var); class sample { public function __toString() { return "sample object"; - } + } } //getting the resource @@ -33,38 +33,38 @@ $values = array ( /*1*/ 0, 1, -2, - + // float values /*4*/ 10.5, -20.5, 10.1234567e10, - + // array values /*7*/ array(), array(0), array(1), array(1, 2), array('color' => 'red', 'item' => 'pen'), - + // boolean values /*12*/ true, false, TRUE, FALSE, - - // null vlaues + + // null values /*16*/ NULL, null, - + // objects /*18*/ new sample(), - + // resource /*19*/ $file_handle, - + // undefined variable /*20*/ @$undefined_var, - + // unset variable /*21*/ @$unset_var ); diff --git a/ext/standard/tests/strings/strtr_with_reference.phpt b/ext/standard/tests/strings/strtr_with_reference.phpt index 21cdc20318..a28d1e7be9 100644 --- a/ext/standard/tests/strings/strtr_with_reference.phpt +++ b/ext/standard/tests/strings/strtr_with_reference.phpt @@ -4,7 +4,7 @@ strtr() with references <?php $foo = 'foo'; -$arr = ['bar' => &$foo]; +$arr = ['bar' => &$foo]; var_dump(strtr('foobar', $arr)); ?> diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index f727ebdf93..70a12c7f36 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strval() function : basic functionality +Test strval() function : basic functionality --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -21,19 +21,19 @@ $values = array( // Simple strings /*1*/ "Hello World", 'Hello World', - + // String with control chars /*3*/ "String\nwith\ncontrol\ncharacters\r\n", - + // String with quotes /*4*/ "String with \"quotes\"", - + //Numeric String /*5*/ "123456", - + // Hexadecimal string /*6*/ "0xABC", - + //Heredoc String /*7*/ $simple_heredoc ); @@ -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_error.phpt b/ext/standard/tests/strings/strval_error.phpt index 94ed70263a..629c003679 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strval() function : usage variations - error conditions +Test strval() function : usage variations - error conditions --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -13,7 +13,7 @@ error_reporting(E_ALL ^ E_NOTICE); class MyClass { - // no toString() method defined + // no toString() method defined } $string = "Hello"; diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 2eb665631e..430a4362bd 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -3,7 +3,7 @@ Test strval() function : usage variations - Pass different data types as strval --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -32,53 +32,53 @@ $values = array( 1, 12345, -12345, - + //Octal values /*5*/ 02, 010, 030071, -030071, - + //Hexadecimal values /*9*/ 0x0, 0x1, 0xABCD, -0xABCD, - + // float data /*13*/ 100.5, -100.5, 100.1234567e10, 100.7654321E-10, .5, - + // array data /*18*/ array(), array('color' => 'red', 'item' => 'pen'), - + // null data /*20*/ NULL, null, - + // boolean data /*22*/ true, false, TRUE, FALSE, - + // empty data /*26*/ "", '', - + // object data /*28*/ new MyClass(), - + // resource -/*29*/ $file_handle, - +/*29*/ $file_handle, + // undefined data /*30*/ @$undefined_var, - + // unset data /*31*/ @$unset_var, ); diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index 009a190280..beeb8c9283 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -3,7 +3,7 @@ Test strval() function : usage variations - Pass all valid char codes --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -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.phpt b/ext/standard/tests/strings/substr.phpt Binary files differindex 0901d2082e..f0fc06424b 100644 --- a/ext/standard/tests/strings/substr.phpt +++ b/ext/standard/tests/strings/substr.phpt diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt index 4f69ee57c5..1fdf1b144f 100644 --- a/ext/standard/tests/strings/substr_compare.phpt +++ b/ext/standard/tests/strings/substr_compare.phpt @@ -33,7 +33,7 @@ bool(false) 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 @@ -41,6 +41,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..a3b3553dfc 100644 --- a/ext/standard/tests/strings/substr_count_basic.phpt +++ b/ext/standard/tests/strings/substr_count_basic.phpt @@ -21,10 +21,10 @@ var_dump(substr_count($a, "bca", -200)); var_dump(substr_count($a, "bca", -200, 50)); var_dump(substr_count($a, "bca", -200, -50)); -echo "Done\n"; +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..c086582caa 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -11,14 +11,14 @@ var_dump( substr_count() ); /* more than expected no. of args */ var_dump( substr_count($str, "t", 0, 15, 30) ); - + /* offset before start */ var_dump(substr_count($str, "t", -20)); /* offset > size of the string */ var_dump(substr_count($str, "t", 25)); -/* Using offset and length to go beyond the size of the string: +/* Using offset and length to go beyond the size of the string: Warning message expected, as length+offset > length of string */ var_dump( substr_count($str, "i", 5, 7) ); @@ -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..c2644ce89b 100644 --- a/ext/standard/tests/strings/substr_count_variation_001.phpt +++ b/ext/standard/tests/strings/substr_count_variation_001.phpt @@ -19,8 +19,8 @@ var_dump( substr_count($str, "I", NULL) ); var_dump( substr_count($str, "i", NULL, 10) ); echo "\n-- overlapped substrings --\n"; -var_dump( substr_count("abcabcabcabcabc", "abca") ); -var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); +var_dump( substr_count("abcabcabcabcabc", "abca") ); +var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); echo "\n-- complex strings containing other than 7-bit chars --\n"; $str = chr(128).chr(129).chr(128).chr(256).chr(255).chr(254).chr(255); @@ -49,7 +49,7 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +echo "Done\n"; ?> --EXPECTF-- @@ -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..a1310a22b5 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -31,10 +31,10 @@ var_dump(substr_count($str, "\0")); var_dump(substr_count($str, "\x000")); var_dump(substr_count($str, "0")); -echo "Done\n"; +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/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt index ac945349fe..0a15035af2 100644 --- a/ext/standard/tests/strings/substr_replace_error.phpt +++ b/ext/standard/tests/strings/substr_replace_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test substr_replace() function : error conditions +Test substr_replace() function : error conditions --FILE-- <?php /* Prototype : mixed substr_replace ( mixed $string , string $replacement , int $start [, int $length ] ) @@ -23,15 +23,15 @@ echo "\n-- Testing substr_replace() function with more than expected no. of argu var_dump(substr_replace($s1, "evening", 5, 7, true)); echo "\n-- Testing substr_replace() function with start and length different types --\n"; -var_dump(substr_replace($s1, "evening", array(5))); -var_dump(substr_replace($s1, "evening", 5, array(8))); - +var_dump(substr_replace($s1, "evening", array(5))); +var_dump(substr_replace($s1, "evening", 5, array(8))); + echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n"; -var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); +var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n"; -var_dump(substr_replace($s1, "evening", array(5), array(8))); - +var_dump(substr_replace($s1, "evening", array(5), array(8))); + ?> ===DONE=== --EXPECTF-- diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt Binary files differindex 330bd01553..2096b61f22 100644 --- a/ext/standard/tests/strings/trim1.phpt +++ b/ext/standard/tests/strings/trim1.phpt diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt index 08f75846a5..501b477420 100644 --- a/ext/standard/tests/strings/trim_basic.phpt +++ b/ext/standard/tests/strings/trim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test trim() function : basic functionality +Test trim() function : basic functionality --FILE-- <?php @@ -17,10 +17,10 @@ $binary = "\x0A\x0DExample string\x0A\x0D"; echo "\n-- Trim string with all white space characters --\n"; var_dump(trim($text)); -echo "\n-- Trim non-whitespace from a string --\n"; +echo "\n-- Trim non-whitespace from a string --\n"; var_dump(trim($hello, "=!")); -echo "\n-- Trim some non-white space characters from a string --\n"; +echo "\n-- Trim some non-white space characters from a string --\n"; var_dump(trim($hello, "Hdle")); echo "\n-- Trim the ASCII control characters at the beginning of a string --\n"; diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt index e34cd144cd..51dc848c9d 100644 --- a/ext/standard/tests/strings/trim_error.phpt +++ b/ext/standard/tests/strings/trim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test trim() function : error conditions +Test trim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt index cbbd5b9e4c..4ef40c6801 100644 --- a/ext/standard/tests/strings/trim_variation1.phpt +++ b/ext/standard/tests/strings/trim_variation1.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " !---sample object---! "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt index b4c0352404..11b2aaf1cc 100644 --- a/ext/standard/tests/strings/trim_variation2.phpt +++ b/ext/standard/tests/strings/trim_variation2.phpt @@ -18,7 +18,7 @@ unset($unset_var); class sample { public function __toString() { return " sample object "; - } + } } //getting the resource @@ -34,36 +34,36 @@ $inputs = array ( 256, 2147483647, -2147483648, - + // float values /*7*/ 10.5, -20.5, 10.1234567e10, - + // array values /*10*/ array(), array(0), array(1, 2), - + // boolean values /*13*/ true, false, TRUE, FALSE, - + // null values /*17*/ NULL, null, - + // objects /*19*/ new sample(), - + // resource /*20*/ $file_handle, - + // undefined variable /*21*/ @$undefined_var, - + // unset variable /*22*/ @$unset_var ); diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt Binary files differindex 66da7a90f3..572d26ebd1 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index 0ef6a850a9..b0e3be80a7 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ucwords() function : basic functionality +Test ucwords() function : basic functionality --FILE-- <?php /* Prototype : string ucwords ( string $str ) @@ -31,7 +31,7 @@ $str_array = array( "testing\fucwords" ); -// loop through the $strings array to test ucwords on each element +// loop through the $strings array to test ucwords on each element $iteration = 1; for($index = 0; $index < count($str_array); $index++) { echo "-- Iteration $iteration --\n"; @@ -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_error.phpt b/ext/standard/tests/strings/ucwords_error.phpt index 7ada10c629..a01c688c4a 100644 --- a/ext/standard/tests/strings/ucwords_error.phpt +++ b/ext/standard/tests/strings/ucwords_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ucwords() function : error conditions +Test ucwords() function : error conditions --FILE-- <?php /* Prototype : string ucwords ( string $str ) diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt index 1604402353..02edf05131 100644 --- a/ext/standard/tests/strings/ucwords_variation1.phpt +++ b/ext/standard/tests/strings/ucwords_variation1.phpt @@ -8,7 +8,7 @@ Test ucwords() function : usage variations - unexpected input values */ /* - * Test ucwords() by passing different values including scalar and non scalar values + * Test ucwords() by passing different values including scalar and non scalar values */ echo "*** Testing ucwords() : usage variations ***\n"; @@ -36,7 +36,7 @@ $values = array ( 12345, -2345, - // hex values + // hex values 0x10, 0X20, 0xAA, @@ -77,12 +77,12 @@ $values = array ( NULL, null, - // hex in string + // hex in string "0x123", '0x123', "0xFF12", "-0xFF12", - + // undefined variable @$undefined_var, 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..8b38bb9401 100644 --- a/ext/standard/tests/strings/ucwords_variation3.phpt +++ b/ext/standard/tests/strings/ucwords_variation3.phpt @@ -29,7 +29,7 @@ $str_array = array( '"testing",ucword,"test"', '"t""t",test, t', '\'t \'t\',test', - + // using other white spaces '\ttesting\ttesting\tucwords', 'testing\rucwords testing ucwords', @@ -41,7 +41,7 @@ $str_array = array( 't@@#$% %test ^test &test *test +test -test', '!test ~test `test` =test= @test@test.com', '/test/r\test\ucwords\t\y\y\u\3 \yy\ /uu/', - + //only special chars '!@#$%^&*()_+=-`~' ); @@ -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..023efd3d46 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -31,7 +31,7 @@ $str_array = array( "\'t \'t\',test", "Jack's pen", "P't'y 't it's ", - + // using other white spaces "\ttesting\ttesting\tucwords", "\\ttesting\\ttesting\tucwords", @@ -48,7 +48,7 @@ $str_array = array( "t@@#$% %test ^test &test *test +test -test", "!test ~test `test` =test= @test@test.com", "/test/r\test\\ucwords\t\y\y\\u\3 \yy\ /uu/", - + //only special chars "!@#$%^&*()_+=-`~" ); @@ -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 7f8cdd4701..8d96369691 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/unpack_error.phpt b/ext/standard/tests/strings/unpack_error.phpt index f04e493772..484366293b 100644 --- a/ext/standard/tests/strings/unpack_error.phpt +++ b/ext/standard/tests/strings/unpack_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test unpack() function : error conditions +Test unpack() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt index 49e9c19562..911cc15cfc 100644 --- a/ext/standard/tests/strings/utf8_decode_error.phpt +++ b/ext/standard/tests/strings/utf8_decode_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test utf8_decode() function : error conditions +Test utf8_decode() function : error conditions --FILE-- <?php /* Prototype : proto string utf8_decode(string data) - * Description: Converts a UTF-8 encoded string to ISO-8859-1 + * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_decode() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt index 63ccf7d7d1..f564b87da0 100644 --- a/ext/standard/tests/strings/utf8_decode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt @@ -3,9 +3,9 @@ Test utf8_decode() function : usage variations - different types for data --FILE-- <?php /* Prototype : proto string utf8_decode(string data) - * Description: Converts a UTF-8 encoded string to ISO-8859-1 + * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_decode() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt index e247c38fbb..e12f0978b6 100644 --- a/ext/standard/tests/strings/utf8_encode_error.phpt +++ b/ext/standard/tests/strings/utf8_encode_error.phpt @@ -3,9 +3,9 @@ Test utf8_encode() function : error conditions --FILE-- <?php /* Prototype : proto string utf8_encode(string data) - * Description: Encodes an ISO-8859-1 string to UTF-8 + * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_encode() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt index a06b8d869e..fa4b79976e 100644 --- a/ext/standard/tests/strings/utf8_encode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt @@ -3,9 +3,9 @@ Test utf8_encode() function : usage variations - <type here specifics of this v --FILE-- <?php /* Prototype : proto string utf8_encode(string data) - * Description: Encodes an ISO-8859-1 string to UTF-8 + * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing utf8_encode() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt index 5a1f3d2a24..3671cd736c 100644 --- a/ext/standard/tests/strings/uuencode.phpt +++ b/ext/standard/tests/strings/uuencode.phpt @@ -17,7 +17,7 @@ var_dump(convert_uudecode(substr($enc, 0, -10))); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: convert_uuencode() expects parameter 1 to be string, array given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index ecdae30241..5ba2b91007 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : basic functionality +Test vfprintf() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ function writeAndDump($fp, $format, $args) @@ -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_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt index db28f5fb70..36d6577bbd 100644 --- a/ext/standard/tests/strings/vfprintf_basic2.phpt +++ b/ext/standard/tests/strings/vfprintf_basic2.phpt @@ -28,13 +28,13 @@ if (!($fp = fopen($data_file, 'wt'))) return; vfprintf($fp, $format1, $arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format2, $arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format3, $arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); fclose($fp); print_r(file_get_contents($data_file)); diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt index bd9efaa2e0..565079dc60 100644 --- a/ext/standard/tests/strings/vfprintf_basic3.phpt +++ b/ext/standard/tests/strings/vfprintf_basic3.phpt @@ -29,22 +29,22 @@ if (!($fp = fopen($data_file, 'wt'))) return; vfprintf($fp, $format1,$arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format11,$arg1); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format2,$arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format22,$arg2); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp,$format3,$arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); vfprintf($fp, $format33,$arg3); -fprintf($fp, "\n"); +fprintf($fp, "\n"); fclose($fp); print_r(file_get_contents($data_file)); diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt index a7a7697dc2..84fbe33f1c 100644 --- a/ext/standard/tests/strings/vfprintf_basic5.phpt +++ b/ext/standard/tests/strings/vfprintf_basic5.phpt @@ -22,7 +22,7 @@ $arg3 = array(65,66,67); $data_file = dirname(__FILE__) . '/vfprintf_basic5.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt index 332370b5de..6c1bbf02a2 100644 --- a/ext/standard/tests/strings/vfprintf_basic6.phpt +++ b/ext/standard/tests/strings/vfprintf_basic6.phpt @@ -23,7 +23,7 @@ $arg3 = array(1000,2000,3000); $data_file = dirname(__FILE__) . '/vfprintf_basic6.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt index f235c1cd6f..f4c11edc15 100644 --- a/ext/standard/tests/strings/vfprintf_basic7.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7.phpt @@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432); $data_file = dirname(__FILE__) . '/vfprintf_basic7.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt index b5526a652f..14cd31ddd2 100644 --- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt @@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432); $data_file = dirname(__FILE__) . '/vfprintf_basic7_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt index ed9d23c2ad..aad883c6e9 100644 --- a/ext/standard/tests/strings/vfprintf_basic8.phpt +++ b/ext/standard/tests/strings/vfprintf_basic8.phpt @@ -22,7 +22,7 @@ $arg3 = array(021,0347,0567); $data_file = dirname(__FILE__) . '/vfprintf_basic8.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + vfprintf($fp, $format1,$arg1); fprintf($fp, "\n"); diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt index c3c869bb4d..8ef086d353 100644 --- a/ext/standard/tests/strings/vfprintf_error1.phpt +++ b/ext/standard/tests/strings/vfprintf_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : error conditions (more than expected arguments) +Test vfprintf() function : error conditions (more than expected arguments) --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt index 1eb89694ec..bcf7e27690 100644 --- a/ext/standard/tests/strings/vfprintf_error2.phpt +++ b/ext/standard/tests/strings/vfprintf_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : error conditions (less than expected arguments) +Test vfprintf() function : error conditions (less than expected arguments) --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index dbc0d08897..5a20780672 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 589d82c3d6..131b0477c4 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ // Open handle diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 6ba79341b2..0d3e70b3fe 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : variation functionality +Test vfprintf() function : variation functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing vfprintf() : variation functionality ***\n"; @@ -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_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt Binary files differindex fac24dc7a9..bb00e70389 100644 --- a/ext/standard/tests/strings/vfprintf_variation10.phpt +++ b/ext/standard/tests/strings/vfprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt index 51ab97e8bf..f0fa354ea6 100644 --- a/ext/standard/tests/strings/vfprintf_variation12.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,7 +64,7 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -86,7 +86,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt index ffd232355c..fe786d3f49 100644 --- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,7 +64,7 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -86,7 +86,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt index ea2957a18c..0173a27fb7 100644 --- a/ext/standard/tests/strings/vfprintf_variation14.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt index 9916967b3f..fb34befd3c 100644 --- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt index b513227836..19e319a557 100644 --- a/ext/standard/tests/strings/vfprintf_variation15.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt index b31ffd3eb4..7bb0d150e0 100644 --- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt @@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -55,7 +55,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index 254bd8c2c1..4995ab02a4 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt index 0819cc0e5f..16d0624018 100644 --- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) @@ -78,7 +78,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt index 545ae6d43d..6c17b801f6 100644 --- a/ext/standard/tests/strings/vfprintf_variation17.phpt +++ b/ext/standard/tests/strings/vfprintf_variation17.phpt @@ -16,9 +16,9 @@ echo "*** Testing vfprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -37,7 +37,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation17.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -51,7 +51,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt index 3d0d810442..5467753dc0 100644 --- a/ext/standard/tests/strings/vfprintf_variation18.phpt +++ b/ext/standard/tests/strings/vfprintf_variation18.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - scientific formats with non-scient echo "*** Testing vfprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e @@ -53,14 +53,14 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ $data_file = dirname(__FILE__) . '/vfprintf_variation18.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -74,7 +74,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt index 19aac7738b..b2fbdd88cf 100644 --- a/ext/standard/tests/strings/vfprintf_variation19.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt index 8ad2df0947..8153ce8129 100644 --- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt @@ -49,7 +49,7 @@ $args_array = array( $data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; - + // looping to test vfprintf() with different scientific formats from the above $format array // and with non-scientific values from the above $args_array array $counter = 1; @@ -63,7 +63,7 @@ fclose($fp); print_r(file_get_contents($data_file)); echo "\n"; -unlink($data_file); +unlink($data_file); ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 3bc9bf6b29..48fea341ed 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -41,44 +41,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1,2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt index 5d8c63e207..09bf703957 100644 --- a/ext/standard/tests/strings/vfprintf_variation21.phpt +++ b/ext/standard/tests/strings/vfprintf_variation21.phpt @@ -41,41 +41,41 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, TRUE, FALSE, - + // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', - + // object data /*20*/ new sample(), - + // undefined data /*21*/ @$undefined_var, - + // unset data /*22*/ @$unset_var, - + // resource data /*23*/ $file_handle ); diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 55bfd465bb..642f35c46a 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index 1bf0861c0f..6bf814003a 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt index 9194d84866..b5b82bbc62 100644 --- a/ext/standard/tests/strings/vfprintf_variation6.phpt +++ b/ext/standard/tests/strings/vfprintf_variation6.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - float formats with non-float value echo "*** Testing vfprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index 036c52b04a..a72e260e09 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vfprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %Ls %4s %-4s %10.4s %-10.4s %04s %04.4s @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, 123456234, -12346789, +12346789, @@ -56,7 +56,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -78,7 +78,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 6f5c7dc6e6..120e947259 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_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index e550ea1c8d..f694155b8f 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : int vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic2.phpt b/ext/standard/tests/strings/vprintf_basic2.phpt index 854d6eaeee..cdf6c2d83f 100644 --- a/ext/standard/tests/strings/vprintf_basic2.phpt +++ b/ext/standard/tests/strings/vprintf_basic2.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic3.phpt b/ext/standard/tests/strings/vprintf_basic3.phpt index 616399eed7..966ea56f71 100644 --- a/ext/standard/tests/strings/vprintf_basic3.phpt +++ b/ext/standard/tests/strings/vprintf_basic3.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic4.phpt b/ext/standard/tests/strings/vprintf_basic4.phpt index d8cfa80452..89494e1217 100644 --- a/ext/standard/tests/strings/vprintf_basic4.phpt +++ b/ext/standard/tests/strings/vprintf_basic4.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic5.phpt b/ext/standard/tests/strings/vprintf_basic5.phpt index 67922eaa5e..e999417bf8 100644 --- a/ext/standard/tests/strings/vprintf_basic5.phpt +++ b/ext/standard/tests/strings/vprintf_basic5.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic6.phpt b/ext/standard/tests/strings/vprintf_basic6.phpt index 9ddead58c4..7f1bbd1dde 100644 --- a/ext/standard/tests/strings/vprintf_basic6.phpt +++ b/ext/standard/tests/strings/vprintf_basic6.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ 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_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt index 6fa89a1ea2..d5f6e222d0 100644 --- a/ext/standard/tests/strings/vprintf_basic8.phpt +++ b/ext/standard/tests/strings/vprintf_basic8.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,15 +20,15 @@ $arg3 = array(021,0347,0567); $result = vprintf($format1,$arg1); echo "\n"; -var_dump($result); +var_dump($result); $result = vprintf($format2,$arg2); echo "\n"; -var_dump($result); +var_dump($result); $result = vprintf($format3,$arg3); echo "\n"; -var_dump($result); +var_dump($result); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vprintf_basic9.phpt b/ext/standard/tests/strings/vprintf_basic9.phpt index 8521d82ec4..4aa12a080f 100644 --- a/ext/standard/tests/strings/vprintf_basic9.phpt +++ b/ext/standard/tests/strings/vprintf_basic9.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_error.phpt b/ext/standard/tests/strings/vprintf_error.phpt index cf25257fc5..91fc1bdc32 100644 --- a/ext/standard/tests/strings/vprintf_error.phpt +++ b/ext/standard/tests/strings/vprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test vprintf() function : error conditions +Test vprintf() function : error conditions --FILE-- <?php /* Prototype : int vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ echo "\n-- Testing vprintf() function with Zero arguments --\n"; var_dump( vprintf() ); echo "\n-- Testing vprintf() function with less than expected no. of arguments --\n"; -var_dump( vprintf($format) ); +var_dump( vprintf($format) ); echo "\n-- testing vprintf() function with more than expected no. of arguments --\n"; var_dump( vprintf($format, $args, $extra_arg) ); diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 5cf50105ab..18f314f284 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for the format ar --FILE-- <?php /* Prototype : string vprintf(string $format, array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -41,44 +41,44 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // array data /*10*/ array(), array(0), array(1), array(1,2), array('color' => 'red', 'item' => 'pen'), - + // null data /*15*/ NULL, null, - + // boolean data /*17*/ true, false, TRUE, FALSE, - + // empty data /*21*/ "", '', - + // object data /*23*/ new sample(), - + // undefined data /*24*/ @$undefined_var, - + // unset data /*25*/ @$unset_var, - + // resource data /*26*/ $file_handle ); @@ -90,9 +90,9 @@ foreach($values as $value) { echo "\n -- Iteration $counter --\n"; $result = vprintf($value,$args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; - + }; // closing the resource diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt Binary files differindex 747b8c40c5..d63738e723 100644 --- a/ext/standard/tests/strings/vprintf_variation10.phpt +++ b/ext/standard/tests/strings/vprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index 99f5c80386..4207bc294e 100644 --- a/ext/standard/tests/strings/vprintf_variation11.phpt +++ b/ext/standard/tests/strings/vprintf_variation11.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,10 +48,10 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt index 22e1d83840..039006fdc6 100644 --- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,10 +48,10 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation12.phpt b/ext/standard/tests/strings/vprintf_variation12.phpt index a4c6139144..99938502d5 100644 --- a/ext/standard/tests/strings/vprintf_variation12.phpt +++ b/ext/standard/tests/strings/vprintf_variation12.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,16 +64,16 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); - echo "\n"; + echo "\n"; var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 4839484ef1..0101f49e50 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; @@ -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_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt index 6f9ab49b98..240db721e8 100644 --- a/ext/standard/tests/strings/vprintf_variation13.phpt +++ b/ext/standard/tests/strings/vprintf_variation13.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt index af5a76eded..06d2bec26d 100644 --- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation14.phpt b/ext/standard/tests/strings/vprintf_variation14.phpt index 830b7f8e15..bbb15e149a 100644 --- a/ext/standard/tests/strings/vprintf_variation14.phpt +++ b/ext/standard/tests/strings/vprintf_variation14.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt index 74b57f4ae8..51b2f477b8 100644 --- a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,18 +64,18 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt index d27bb6270a..97b1bc5c64 100644 --- a/ext/standard/tests/strings/vprintf_variation15.phpt +++ b/ext/standard/tests/strings/vprintf_variation15.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -44,7 +44,7 @@ foreach($formats as $format) { echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 53071c6da1..97bc9dcd8c 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -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_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt index 78e03644cc..8c3d66d02d 100644 --- a/ext/standard/tests/strings/vprintf_variation16.phpt +++ b/ext/standard/tests/strings/vprintf_variation16.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt index 5189d58abc..dab90d1e45 100644 --- a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation17.phpt b/ext/standard/tests/strings/vprintf_variation17.phpt index e86f80551c..e2e8530153 100644 --- a/ext/standard/tests/strings/vprintf_variation17.phpt +++ b/ext/standard/tests/strings/vprintf_variation17.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -16,9 +16,9 @@ echo "*** Testing vprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -32,7 +32,7 @@ $args_array = array( array(1e1, +1e2, -1e3, "1e2_"), array(3e3, 4e3, 1e3, 2e3) ); - + // looping to test vprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation18.phpt b/ext/standard/tests/strings/vprintf_variation18.phpt index 91f5d13694..8b30ae78d9 100644 --- a/ext/standard/tests/strings/vprintf_variation18.phpt +++ b/ext/standard/tests/strings/vprintf_variation18.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti echo "*** Testing vprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different scientific formats from the above $format array diff --git a/ext/standard/tests/strings/vprintf_variation19.phpt b/ext/standard/tests/strings/vprintf_variation19.phpt index 6ceda77022..8b826d8e94 100644 --- a/ext/standard/tests/strings/vprintf_variation19.phpt +++ b/ext/standard/tests/strings/vprintf_variation19.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt index 9d059569f2..6abc134549 100644 --- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -49,7 +49,7 @@ foreach($formats as $format) { echo"\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt index 69e17d21a7..63c3dfe39e 100644 --- a/ext/standard/tests/strings/vprintf_variation2.phpt +++ b/ext/standard/tests/strings/vprintf_variation2.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for args argument --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -41,41 +41,41 @@ $values = array( 1, 12345, -2345, - + // float data /*5*/ 10.5, -10.5, 10.1234567e10, 10.7654321E-10, .5, - + // null data /*10*/ NULL, null, - + // boolean data /*12*/ true, false, TRUE, FALSE, - + // empty data /*16*/ "", '', - + // string data /*18*/ "string", 'string', - + // object data /*20*/ new sample(), - + // undefined data /*21*/ @$undefined_var, - + // unset data /*22*/ @$unset_var, - + // resource data /*23*/ $file_handle ); diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt index 6967679715..0b59ddda1f 100644 --- a/ext/standard/tests/strings/vprintf_variation3.phpt +++ b/ext/standard/tests/strings/vprintf_variation3.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -45,7 +45,7 @@ $args_array = array( // and with int values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt index aab27337d9..8d56fc9cb1 100644 --- a/ext/standard/tests/strings/vprintf_variation4.phpt +++ b/ext/standard/tests/strings/vprintf_variation4.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different int formats from the above $format array diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt index 76c079d69a..f81dba32a1 100644 --- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different int formats from the above $format array @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt index dde6170e9f..f54d1e19c5 100644 --- a/ext/standard/tests/strings/vprintf_variation5.phpt +++ b/ext/standard/tests/strings/vprintf_variation5.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -45,7 +45,7 @@ $args_array = array( // and with float values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; $result = vprintf($format, $args_array[$counter-1]); echo "\n"; var_dump($result); diff --git a/ext/standard/tests/strings/vprintf_variation6.phpt b/ext/standard/tests/strings/vprintf_variation6.phpt index 0283bc4541..265948b565 100644 --- a/ext/standard/tests/strings/vprintf_variation6.phpt +++ b/ext/standard/tests/strings/vprintf_variation6.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with non-float values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vprintf() function : usage variations - float formats with non-float values echo "*** Testing vprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f @@ -53,9 +53,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different float formats from the above $format array // and with non-float values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation7.phpt b/ext/standard/tests/strings/vprintf_variation7.phpt Binary files differindex d7c81fca14..ef2bfecdfb 100644 --- a/ext/standard/tests/strings/vprintf_variation7.phpt +++ b/ext/standard/tests/strings/vprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index f635b1d4c0..c0558ff6b7 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - string formats with non-string valu --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %Ls %4s %-4s %10.4s %-10.4s %04s %04.4s @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, 123456234, -12346789, +12346789, @@ -56,9 +56,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different string formats from the above $format array // and with non-string values from the above $args_array array $counter = 1; @@ -66,7 +66,7 @@ foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; $result = vprintf($formats, $args); echo "\n"; - var_dump($result); + var_dump($result); $counter++; } diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 7d55d94f87..14609374a8 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..960fcadc3a 100644 --- a/ext/standard/tests/strings/vsprintf_basic1.phpt +++ b/ext/standard/tests/strings/vsprintf_basic1.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..bd1c3dd519 100644 --- a/ext/standard/tests/strings/vsprintf_basic2.phpt +++ b/ext/standard/tests/strings/vsprintf_basic2.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * 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 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..fd0289ede8 100644 --- a/ext/standard/tests/strings/vsprintf_basic3.phpt +++ b/ext/standard/tests/strings/vsprintf_basic3.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..15f4a1a680 100644 --- a/ext/standard/tests/strings/vsprintf_basic4.phpt +++ b/ext/standard/tests/strings/vsprintf_basic4.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..3cb5ab15a1 100644 --- a/ext/standard/tests/strings/vsprintf_basic5.phpt +++ b/ext/standard/tests/strings/vsprintf_basic5.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..74dec1ce74 100644 --- a/ext/standard/tests/strings/vsprintf_basic6.phpt +++ b/ext/standard/tests/strings/vsprintf_basic6.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..3cc02c2e62 100644 --- a/ext/standard/tests/strings/vsprintf_basic8.phpt +++ b/ext/standard/tests/strings/vsprintf_basic8.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..571d9ac2de 100644 --- a/ext/standard/tests/strings/vsprintf_basic9.phpt +++ b/ext/standard/tests/strings/vsprintf_basic9.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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_error.phpt b/ext/standard/tests/strings/vsprintf_error.phpt index 2876eb1334..8d581474b4 100644 --- a/ext/standard/tests/strings/vsprintf_error.phpt +++ b/ext/standard/tests/strings/vsprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test vsprintf() function : error conditions +Test vsprintf() function : error conditions --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ echo "\n-- Testing vsprintf() function with Zero arguments --\n"; var_dump( vsprintf() ); echo "\n-- Testing vsprintf() function with less than expected no. of arguments --\n"; -var_dump( vsprintf($format) ); +var_dump( vsprintf($format) ); echo "\n-- testing vsprintf() function with more than expected no. of arguments --\n"; var_dump( vsprintf($format, $args, $extra_arg) ); diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 15c749d3f8..3911587620 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for the format a --FILE-- <?php /* Prototype : string vsprintf(string $format, array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -78,7 +78,7 @@ $values = array( // unset data @$unset_var, - + // resource data $file_handle ); @@ -90,7 +90,7 @@ foreach($values as $value) { echo "\n -- Iteration $counter --\n"; var_dump( vsprintf($value,$args) ); $counter++; - + }; // closing the resource diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 1720164f76..9678398058 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 11cba07506..3d5eb1cfc3 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -56,7 +56,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 43446e4ede..6d9c4c4b79 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -56,7 +56,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..8437487904 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; @@ -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..17698497e2 100644 --- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; @@ -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 9417ab1319..6be9d4a9a8 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -56,7 +56,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 f81476baea..59efbf9d22 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -48,7 +48,7 @@ $args_array = array( // and with octal values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -56,7 +56,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..d63165046c 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; @@ -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..5f31e385ec 100644 --- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; @@ -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.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt index 62688be727..bc1d786920 100644 --- a/ext/standard/tests/strings/vsprintf_variation15.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index b95d635800..35a78200a6 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n"; // defining array of unsigned formats $formats = array( - '%u %+u %-u', + '%u %+u %-u', '%lu %Lu %4u %-4u', - '%10.4u %-10.4u %.4u', + '%10.4u %-10.4u %.4u', '%\'#2u %\'2u %\'$2u %\'_2u', '%3$u %4$u %1$u %2$u' ); @@ -36,7 +36,7 @@ $args_array = array( array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -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..8fb03d609d 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -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..b138c32614 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u @@ -57,9 +57,9 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different unsigned formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -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..81dec4d89c 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -16,9 +16,9 @@ echo "*** Testing vsprintf() : scientific formats and scientific values ***\n"; // defining array of scientific formats $formats = array( - '%e %+e %-e', + '%e %+e %-e', '%le %Le %4e %-4e', - '%10.4e %-10.4e %.4e', + '%10.4e %-10.4e %.4e', '%\'#20e %\'20e %\'$20e %\'_20e', '%3$e %4$e %1$e %2$e' ); @@ -32,7 +32,7 @@ $args_array = array( array(1e1, +1e2, -1e3, "1e2_"), array(3e3, 4e3, 1e3, 2e3) ); - + // looping to test vsprintf() with different scientific formats from the above $format array // and with signed and other types of values from the above $args_array array $counter = 1; @@ -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..87ba0440e4 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient echo "*** Testing vsprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e @@ -53,7 +53,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different scientific formats from the above $format array @@ -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..de56405eed 100644 --- a/ext/standard/tests/strings/vsprintf_variation19.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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..9385a6e67f 100644 --- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -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_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt index 9061c092fe..acf4bea9e3 100644 --- a/ext/standard/tests/strings/vsprintf_variation2.phpt +++ b/ext/standard/tests/strings/vsprintf_variation2.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for args argumen --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 777c911c8b..e71bf1c178 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -45,7 +45,7 @@ $args_array = array( // and with int values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -53,7 +53,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..3decee6310 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different int formats from the above $format array @@ -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..83f0327423 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d @@ -57,7 +57,7 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different int formats from the above $format array @@ -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 cf172899d2..42db3d4405 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -45,7 +45,7 @@ $args_array = array( // and with float values from the above $args_array array $counter = 1; foreach($formats as $format) { - echo "\n-- Iteration $counter --\n"; + echo "\n-- Iteration $counter --\n"; var_dump( vsprintf($format, $args_array[$counter-1]) ); $counter++; } @@ -53,7 +53,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..f638e51726 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with non-float value --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - float formats with non-float value echo "*** Testing vsprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f @@ -53,9 +53,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different float formats from the above $format array // and with non-float values from the above $args_array array $counter = 1; @@ -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_variation7.phpt b/ext/standard/tests/strings/vsprintf_variation7.phpt Binary files differindex 8f5b8862c2..0085138b78 100644 --- a/ext/standard/tests/strings/vsprintf_variation7.phpt +++ b/ext/standard/tests/strings/vsprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 109d8b626e..f44eae2db2 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - string formats with non-string val --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vsprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %4s %-4s %10.4s %-10.4s %04s %04.4s @@ -34,7 +34,7 @@ $args_array = array( 2.1234567e10, +2.7654321e10, -2.7654321e10, 2.1234567e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, 123456, -12346789, +12346789, @@ -56,9 +56,9 @@ $args_array = array( true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different string formats from the above $format array // and with non-string values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex 14180654d0..dcc1102ea0 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..1760a9cc77 100644 --- a/ext/standard/tests/strings/wordwrap_basic.phpt +++ b/ext/standard/tests/strings/wordwrap_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test wordwrap() function : basic functionality +Test wordwrap() function : basic functionality --FILE-- <?php /* Prototype : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] ) @@ -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_error.phpt b/ext/standard/tests/strings/wordwrap_error.phpt index 41c5cbdb69..98f199abc6 100644 --- a/ext/standard/tests/strings/wordwrap_error.phpt +++ b/ext/standard/tests/strings/wordwrap_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test wordwrap() function : error conditions +Test wordwrap() function : error conditions --FILE-- <?php /* Prototype : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] ) @@ -32,7 +32,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "-- width = 0 & cut = true --\n"; -// width as zero and cut as true +// width as zero and cut as true $width = 0; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); @@ -44,7 +44,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "-- width = -10 & cut = true --\n"; -// width as -ne and cut as true +// width as -ne and cut as true $width = -10; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt index 59462448c8..28fc128bb7 100644 --- a/ext/standard/tests/strings/wordwrap_variation1.phpt +++ b/ext/standard/tests/strings/wordwrap_variation1.phpt @@ -97,7 +97,7 @@ for($index = 0; $index < count($values); $index ++) { $counter ++; } -// close the resource +// close the resource fclose($fp); echo "Done\n"; diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt index 194af0e22f..61d2bbfc8b 100644 --- a/ext/standard/tests/strings/wordwrap_variation2.phpt +++ b/ext/standard/tests/strings/wordwrap_variation2.phpt @@ -8,7 +8,7 @@ Test wordwrap() function : usage variations - unexpected values for width argum */ /* - * test wordwrap by passing different values for width argument + * test wordwrap by passing different values for width argument */ echo "*** Testing wordwrap() : usage variations ***\n"; // initialize all required variables @@ -16,7 +16,7 @@ $str = 'testing wordwrap function'; $break = '<br />\n'; $cut = true; -// resource var +// resource var $fp = fopen(__FILE__, "r"); // get an unset variable @@ -53,7 +53,7 @@ $values = array ( // objects new stdclass(), - // Null value + // Null value NULL, null, @@ -83,7 +83,7 @@ for($index = 0; $index < count($values); $index ++) { var_dump( wordwrap($str, $width) ); var_dump( wordwrap($str, $width, $break) ); - // cut as false + // cut as false $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); @@ -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_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt index 5774ce3752..ddf04c77c9 100644 --- a/ext/standard/tests/strings/wordwrap_variation3.phpt +++ b/ext/standard/tests/strings/wordwrap_variation3.phpt @@ -8,7 +8,7 @@ Test wordwrap() function : usage variations - unexptected values for break argu */ /* - * test wordwrap by passing different values for break argument + * test wordwrap by passing different values for break argument */ echo "*** Testing wordwrap() : usage variations ***\n"; // initialize all required variables @@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) { $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); - // $cut as true + // $cut as true $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); 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..ebfffe4040 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -37,10 +37,10 @@ echo "-- with cut value as true --\n"; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); 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..0b76404ccb 100644 --- a/ext/standard/tests/time/001.phpt +++ b/ext/standard/tests/time/001.phpt @@ -1,9 +1,8 @@ --TEST-- microtime() function --SKIPIF-- -<?php - if (!function_exists('microtime')) die('skip microtime() not available'); - die('warn system dependent'); +<?php + if (!function_exists('microtime')) die('skip microtime() not available'); ?> --FILE-- <?php diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index e53822ffc8..8fbe37cd82 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strptime() function : basic functionality +Test strptime() function : basic functionality --SKIPIF-- -<?php - if (!function_exists('strptime')) { - die("skip - strptime() function not available in this build"); - } +<?php + if (!function_exists('strptime')) { + die("skip - strptime() function not available in this build"); + } if(PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin"); ?> @@ -16,13 +16,13 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:00:00 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); var_dump(strptime($str, '%H:%M:%S %p %B %d %Y')); @@ -35,7 +35,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/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index a84216f4ff..ae55028cb2 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -1,20 +1,20 @@ --TEST-- Test localtime() function : error conditions --SKIPIF-- -<?php +<?php if (!function_exists('strptime')) { echo "SKIP strptime function not available in build"; -} -?> +} +?> --FILE-- <?php /* Prototype : array strptime ( string $date , string $format ) * Description: Parse a time/date generated with strftime() * Source code: ext/standard/datetime.c - * Alias to functions: + * Alias to functions: */ -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); echo "*** Testing strptime() : error conditions ***\n"; diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt index 6a772d588c..fbe684b863 100644 --- a/ext/standard/tests/time/strptime_parts.phpt +++ b/ext/standard/tests/time/strptime_parts.phpt @@ -1,10 +1,10 @@ --TEST-- -Test strptime() function : basic functionality +Test strptime() function : basic functionality --SKIPIF-- -<?php - if (!function_exists('strptime')) { - die("skip - strptime() function not available in this build"); - } +<?php + if (!function_exists('strptime')) { + die("skip - strptime() function not available in this build"); + } ?> --FILE-- @@ -15,14 +15,14 @@ Test strptime() function : basic functionality */ $orig = setlocale(LC_ALL, 'C'); -date_default_timezone_set("GMT"); +date_default_timezone_set("GMT"); putenv("TZ=GMT"); echo "*** Testing strptime() : basic functionality ***\n"; $input = "10:01:20 AM July 2 1963"; $tstamp = strtotime($input); - + $str = strftime("%r %B%e %Y %Z", $tstamp); $res = strptime($str, '%H:%M:%S %p %B %d %Y %Z'); var_dump($res["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 232a0a6f71..516666c53c 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : basic functionality - ensure all base64 alphabet --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "Decode an input string containing the whole base64 alphabet:\n"; @@ -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 4ca8d8f664..c6afffd389 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : basic functionality - strict vs non-strict with --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "Decode 'hello world!':\n"; @@ -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_error_001.phpt b/ext/standard/tests/url/base64_decode_error_001.phpt index 8da0a3ae2f..2725164464 100644 --- a/ext/standard/tests/url/base64_decode_error_001.phpt +++ b/ext/standard/tests/url/base64_decode_error_001.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_decode() : error conditions ***\n"; diff --git a/ext/standard/tests/url/base64_decode_variation_001.phpt b/ext/standard/tests/url/base64_decode_variation_001.phpt index 7c11ad2c33..f4906a774a 100644 --- a/ext/standard/tests/url/base64_decode_variation_001.phpt +++ b/ext/standard/tests/url/base64_decode_variation_001.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : usage variations - unexpected types for arg 1 --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -32,44 +32,44 @@ $values = array ( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); @@ -79,12 +79,12 @@ $values = array ( foreach($values as $key=>$value) { echo "\n-- Arg value $key --\n"; $output = base64_decode($value, $strict); - - if (is_string($output)) { + + if (is_string($output)) { var_dump(bin2hex($output)); } else { - var_dump($output); - } + var_dump($output); + } }; ?> diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index 6b4628d3bf..0443eefaf8 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -3,9 +3,9 @@ Test base64_decode() function : usage variations - unexpected types for arg 2 --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -32,44 +32,44 @@ $values = array ( "1" => 1, "12345" => 12345, "-2345" => -2345, - + // float data "10.5" => 10.5, "-10.5" => -10.5, "10.1234567e10" => 10.1234567e10, "10.7654321E-10" => 10.7654321E-10, ".5" => .5, - + // array data "array()" => array(), "array(0)" => array(0), "array(1)" => array(1), "array(1, 2)" => array(1, 2), "array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'), - + // null data "NULL" => NULL, "null" => null, - + // boolean data "true" => true, "false" => false, "TRUE" => TRUE, "FALSE" => FALSE, - + // empty data "\"\"" => "", "''" => '', - + // object data "stdClass object" => new stdclass(), - + // undefined data "undefined variable" => $undefined_var, - + // unset data "unset variable" => $unset_var, - + // resource data "resource" => $file_handle ); @@ -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===
\ No newline at end of file diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index c3cbf12c55..6f5e0a28da 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test base64_encode() function : basic functionality +Test base64_encode() function : basic functionality --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..e2304ec06e 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -1,11 +1,11 @@ --TEST-- -Test base64_encode() function : basic functionality - check algorithm round trips +Test base64_encode() function : basic functionality - check algorithm round trips --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ /* @@ -27,7 +27,7 @@ echo "\n--- Testing base64_encode() with binary string input ---\n"; $counter = 1; foreach($values as $str) { echo "-- Iteration $counter --\n"; - + $enc = base64_encode($str); $dec = base64_decode($enc); @@ -35,14 +35,14 @@ foreach($values as $str) { echo "TEST FAILED\n"; } else { echo "TEST PASSED\n"; - } + } $counter ++; } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** --- Testing base64_encode() with binary string input --- diff --git a/ext/standard/tests/url/base64_encode_error_001.phpt b/ext/standard/tests/url/base64_encode_error_001.phpt index d87e148302..a8883ac8f9 100644 --- a/ext/standard/tests/url/base64_encode_error_001.phpt +++ b/ext/standard/tests/url/base64_encode_error_001.phpt @@ -3,9 +3,9 @@ Test base64_encode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_encode() : error conditions - wrong number of args ***\n"; diff --git a/ext/standard/tests/url/base64_encode_variation_001.phpt b/ext/standard/tests/url/base64_encode_variation_001.phpt index bdf2bc0dd4..f632bebf5d 100644 --- a/ext/standard/tests/url/base64_encode_variation_001.phpt +++ b/ext/standard/tests/url/base64_encode_variation_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test base64_encode() function : usage variations - unexpected types for argument 1 +Test base64_encode() function : usage variations - unexpected types for argument 1 --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing base64_encode() : usage variations ***\n"; diff --git a/ext/standard/tests/url/bug53248.phpt b/ext/standard/tests/url/bug53248.phpt index 5e31c510df..5cff9f1c47 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_-.~"
\ No newline at end of file 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 4a335c8a75..a1bcdba99b 100644 --- a/ext/standard/tests/url/get_headers_error_002.phpt +++ b/ext/standard/tests/url/get_headers_error_002.phpt @@ -39,17 +39,17 @@ 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 6c8878513c..81265eecc9 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 53c68e86f1..e963da377c 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying the component +Test parse_url() function: Parse a load of URLs without specifying the component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a and return its components + * Description: Parse a and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index 2e5a060a51..fafc877502 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..76f70da4d8 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..5dda51372a 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..65ae06a469 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..3f06a50aef 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..67827e05c0 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..f2b64da280 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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..c38a69d0dd 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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 05b167cf6d..ff509e9744 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_url() function : check values of URL related constants +Test parse_url() function : check values of URL related constants --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ /* @@ -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_error_001.phpt b/ext/standard/tests/url/parse_url_error_001.phpt index c2740dedd9..0280a87cbc 100644 --- a/ext/standard/tests/url/parse_url_error_001.phpt +++ b/ext/standard/tests/url/parse_url_error_001.phpt @@ -3,9 +3,9 @@ Test parse_url() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_url() : error conditions ***\n"; diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt index 6131f1a457..45c20f410d 100644 --- a/ext/standard/tests/url/parse_url_error_002.phpt +++ b/ext/standard/tests/url/parse_url_error_002.phpt @@ -3,9 +3,9 @@ Test parse_url() function: url component specifier out of range --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ echo "*** Testing parse_url() : error conditions: url component specifier out of range ***\n"; diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index bb0e096856..00cdeab9a9 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"]=> diff --git a/ext/standard/tests/url/parse_url_variation_001.phpt b/ext/standard/tests/url/parse_url_variation_001.phpt index fe04ad4a09..0b804eed57 100644 --- a/ext/standard/tests/url/parse_url_variation_001.phpt +++ b/ext/standard/tests/url/parse_url_variation_001.phpt @@ -3,9 +3,9 @@ Test parse_url() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { 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 0e73ee3637..fe4ca7bd09 100644 --- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -5,9 +5,9 @@ Test parse_url() function : usage variations - unexpected type for arg 2. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -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 516f804edb..adf9c03058 100644 --- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -5,9 +5,9 @@ Test parse_url() function : usage variations - unexpected type for arg 2. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { @@ -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/url/rawurldecode_error_001.phpt b/ext/standard/tests/url/rawurldecode_error_001.phpt index 0fe038caef..1dcaf40fd4 100644 --- a/ext/standard/tests/url/rawurldecode_error_001.phpt +++ b/ext/standard/tests/url/rawurldecode_error_001.phpt @@ -3,9 +3,9 @@ Test rawurldecode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string rawurldecode(string str) - * Description: Decodes URL-encodes string + * Description: Decodes URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurldecode_variation_001.phpt b/ext/standard/tests/url/rawurldecode_variation_001.phpt index 6428b96fcf..9527fe6062 100644 --- a/ext/standard/tests/url/rawurldecode_variation_001.phpt +++ b/ext/standard/tests/url/rawurldecode_variation_001.phpt @@ -3,9 +3,9 @@ Test rawurldecode() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto string rawurldecode(string str) - * Description: Decodes URL-encodes string + * Description: Decodes URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurlencode_error_001.phpt b/ext/standard/tests/url/rawurlencode_error_001.phpt index f8b3e61c37..7acce9e0c4 100644 --- a/ext/standard/tests/url/rawurlencode_error_001.phpt +++ b/ext/standard/tests/url/rawurlencode_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test rawurlencode() function : error conditions +Test rawurlencode() function : error conditions --FILE-- <?php /* Prototype : proto string rawurlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/rawurlencode_variation_001.phpt b/ext/standard/tests/url/rawurlencode_variation_001.phpt index 1dabc4bde9..a3443361ec 100644 --- a/ext/standard/tests/url/rawurlencode_variation_001.phpt +++ b/ext/standard/tests/url/rawurlencode_variation_001.phpt @@ -3,9 +3,9 @@ Test rawurlencode() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto string rawurlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urldecode_error_001.phpt b/ext/standard/tests/url/urldecode_error_001.phpt index b009d7d53e..f0e5ae0838 100644 --- a/ext/standard/tests/url/urldecode_error_001.phpt +++ b/ext/standard/tests/url/urldecode_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test urldecode() function : error conditions +Test urldecode() function : error conditions --FILE-- <?php /* Prototype : proto string urldecode(string str) - * Description: Decodes URL-encoded string + * Description: Decodes URL-encoded string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urldecode_variation_001.phpt b/ext/standard/tests/url/urldecode_variation_001.phpt index fe538b7072..42026d103c 100644 --- a/ext/standard/tests/url/urldecode_variation_001.phpt +++ b/ext/standard/tests/url/urldecode_variation_001.phpt @@ -3,9 +3,9 @@ Test urldecode() function : usage variations - <type here specifics of this var --FILE-- <?php /* Prototype : proto string urldecode(string str) - * Description: Decodes URL-encoded string + * Description: Decodes URL-encoded string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urlencode_error_001.phpt b/ext/standard/tests/url/urlencode_error_001.phpt index 7e43ef73bf..fc00b057d8 100644 --- a/ext/standard/tests/url/urlencode_error_001.phpt +++ b/ext/standard/tests/url/urlencode_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test urlencode() function : error conditions +Test urlencode() function : error conditions --FILE-- <?php /* Prototype : proto string urlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/url/urlencode_variation_001.phpt b/ext/standard/tests/url/urlencode_variation_001.phpt index d74209d137..04d0921b2c 100644 --- a/ext/standard/tests/url/urlencode_variation_001.phpt +++ b/ext/standard/tests/url/urlencode_variation_001.phpt @@ -3,9 +3,9 @@ Test urlencode() function : usage variations - <type here specifics of this var --FILE-- <?php /* Prototype : proto string urlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c - * Alias to functions: + * Alias to functions: */ // NB: basic functionality tested in tests/strings/001.phpt diff --git a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt index 01f23e7601..4e45870dfc 100644 --- a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt @@ -1,5 +1,5 @@ --TEST-- -php_sapi_name() function when switching to webserver by using post +php_sapi_name() function when switching to webserver by using post --POST-- foo=BAR --CREDITS-- diff --git a/ext/standard/tests/versioning/phpversion.phpt b/ext/standard/tests/versioning/phpversion.phpt index ef8c354c36..9cd70c488c 100644 --- a/ext/standard/tests/versioning/phpversion.phpt +++ b/ext/standard/tests/versioning/phpversion.phpt @@ -6,7 +6,7 @@ phpversion test print phpversion(); print "\n"; print phpversion('standard'); - +?> --EXPECTF-- %s %s |