diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 17:45:48 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 19:45:12 +0200 |
| commit | 782352c54ad69c517e3c32b0dd2c25d74842647a (patch) | |
| tree | 220bdc1e814e9f44b3578d49b3f239a3fdefa1d0 /ext/standard/tests/array | |
| parent | 604d4bdae5037e021c1f9d35f08cbeddd610d84c (diff) | |
| download | php-git-782352c54ad69c517e3c32b0dd2c25d74842647a.tar.gz | |
Trim trailing whitespace in *.phpt
Diffstat (limited to 'ext/standard/tests/array')
724 files changed, 2028 insertions, 2028 deletions
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 667c954895..c82f5f7fd0 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 */ diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index f275085de5..017456917e 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) diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 1ce78d51fe..ca9a21128b 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), 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 5c2d524f9b..3f8d502ffe 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -6,17 +6,17 @@ 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"; ?> 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 ef4ce85256..450d8bc0ce 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: Returns 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(), 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 818c20e2ee..4dd28d9a39 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: Returns 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*/ "", '', 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 025e8f5d61..83a642dc3e 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: Returns 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', 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 022cee099d..aa4c77fe3a 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: Returns 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 */ 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 b58e78317f..a86af30472 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: Returns 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 */ 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 c4aaa0bde4..182927fa26 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: Returns 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 */ 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 b7539c63a6..cd62ae1db7 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: Returns 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 */ 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 423310d7ab..4b82cf6b87 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 */ diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt index 2560332bf5..6d8b74545e 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 44c9b5ffaa..b84b0871f4 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -20,19 +20,19 @@ $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++; } diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index 6e622df070..10dcc9e5ba 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++; diff --git a/ext/standard/tests/array/array_chunk_error.phpt b/ext/standard/tests/array/array_chunk_error.phpt index 5197945994..d2cbbe16e3 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 8c0a2cccf5..e4437ccf1a 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 diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt index b36c194a87..ea6468cd8b 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"; diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt index 26eefc3507..6492410c66 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"; diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt index b5d0818327..d82f9fcc5f 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,18 +18,18 @@ $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"; diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt index 8d36092822..50050892e7 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 0f66fc19f5..96344b074f 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) diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index 0d5ccb7e6d..513487fab8 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] ); diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt index 40fb677234..6079f4119e 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 */ diff --git a/ext/standard/tests/array/array_combine_error1.phpt b/ext/standard/tests/array/array_combine_error1.phpt index aa5a1afe1b..efb4e68cf6 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 4224f1c8eb..2d820a0d21 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 afb16971fe..f9978f5476 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 diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt index 9c350c8aa3..2d888df694 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 */ diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 5d03ffe068..ba349c3921 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 */ diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt index bcd8428cee..dd3187a1f0 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 4d9f185786..db5c90df34 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 654ba0f16a..1e51c9886e 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"; diff --git a/ext/standard/tests/array/array_count_values2.phpt b/ext/standard/tests/array/array_count_values2.phpt index 6ec907856c..8aaf445f93 100644 --- a/ext/standard/tests/array/array_count_values2.phpt +++ b/ext/standard/tests/array/array_count_values2.phpt @@ -2,18 +2,18 @@ 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)); ?> diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt index e544c8117c..c66c2a4718 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: */ /* diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 9a2830b918..3eb92b49d4 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: */ /* diff --git a/ext/standard/tests/array/array_diff_assoc.phpt b/ext/standard/tests/array/array_diff_assoc.phpt index 29db107d65..509c632ba5 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 919bd9b3ad..92be673501 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 */ diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt index 211907c726..e3513a9346 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 10b012414c..89277f787a 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(), diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index 5e4460cd2a..fcddbb394d 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)); diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index b625819c01..c5e95ad393 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(), diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 1d4aaf2e43..36d31b078b 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 c93f9c1d0f..d0f70580ff 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( diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index ddaebb85ef..0039770269 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 */ diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index e04d80724b..b8894e5d7e 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) ); diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index eeb881f629..99bfd6638e 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 */ diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 54680957ab..8569703435 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)); diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index bc3e5417cc..bbb5914496 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'])); diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt index 4ef78f88f9..418dbc5b39 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 */ diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt index 019cffb1ef..67c1b6fcc4 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_basic.phpt b/ext/standard/tests/array/array_diff_key_basic.phpt index 6f6fcb9a4d..40d02d4785 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 90168f5de6..05d5cf3c27 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 689cbd6ae2..179b07259a 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt index e404fe680d..fb0bcd6796 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt index 029792d12b..cf8ae6db9b 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index 4201becefd..80755540f5 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'), diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index ff8f3aff4b..0885cfeacf 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 diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 8670d05257..a081571930 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"; diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index d3acf8c88c..3b255b8b19 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,7 +27,7 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index 7134b4e52d..1a08d78f16 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"; diff --git a/ext/standard/tests/array/array_diff_uassoc_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt index 6a96be6b7c..419b916fd8 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 0f9f82464c..d90c80f20b 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 2e035cc8b2..aad42705db 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index db0476ae34..a32d566062 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,13 +11,13 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index f2e945840f..d317bfcde0 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,13 +11,13 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 656faf4793..c0f88f5051 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,8 +27,8 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index 4094218697..53a45ee278 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt index a98a2800da..f8fc5a4b4b 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 c756e48d11..ae664f9812 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation3.phpt b/ext/standard/tests/array/array_diff_uassoc_variation3.phpt index 3218dd3b6c..6f413f623e 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 0c530739f6..8ea51a4103 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt index dde0b1ea07..9cd44cf1d8 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt index 998cc33f42..463ca80d5c 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt index cbc1d8305c..4312688c59 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt index 40062170c4..7bbe12212b 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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index cb4672773d..fa36ea3ac2 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,8 +23,8 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_diff_ukey_basic.phpt b/ext/standard/tests/array/array_diff_ukey_basic.phpt index 7ac309a01e..3dde1646af 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 1a73bdfd5f..92b6ce0f2c 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 386447c5f0..bbf349c4fd 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt index 58a040b0a7..09b4a70237 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 0ad3fbac5e..074be3bae8 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 8a825d361e..38141a430c 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation3.phpt b/ext/standard/tests/array/array_diff_ukey_variation3.phpt index a1f1897208..572061d697 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation4.phpt b/ext/standard/tests/array/array_diff_ukey_variation4.phpt index a0399c2fa4..b34083308e 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 eae2cbb915..7606212023 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"; diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index ab94239696..1131922fc8 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'), diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index d499fe73c1..16ba89e9f1 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) { diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index c3dbdc1376..0048bbb3fa 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) diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index c211bfe88b..5fdb0d4e24 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,7 +26,7 @@ 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=== diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index bfe7ac439e..e162c523d6 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(), diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index ec748c2884..239326821f 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)); diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index 7f3f36c9e6..a501246fa0 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", diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 5888c3b1ba..879a3b8aae 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) ); diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 01fb1a43ef..d79686ed6f 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) ); diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index 71667f67fa..be0340b9f1 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)); diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 9a71db570c..085831c020 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)); diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index 8274d858ca..37b819895a 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 */ diff --git a/ext/standard/tests/array/array_diff_variation8.phpt b/ext/standard/tests/array/array_diff_variation8.phpt index 99f9614d72..9d768fa731 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 83302378f0..05b6a1eb02 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_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index a368bbaf93..5575cee6d6 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,7 +38,7 @@ for($i = 0; $i < count($values); $i ++) var_dump( array_fill($start_key,$num,$val) ); $counter++; -} +} echo "Done"; ?> diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt index 33ee2b3858..2fbdb850c3 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 012a729d62..59a2301c11 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 9fab89d7f2..234aa6ef69 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 1c9382eb09..de62bf4b30 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 */ diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt index c6eee72175..6d37a916ba 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 */ diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 209443db08..086a10df2a 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 aa1db044cc..c784b54415 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 5701f79b48..f3bdef1b61 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 ++; } diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt index 699e98b1b3..ba3a70c482 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 ++; } diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt index d3955fdaaa..1209aea44d 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 ++; } diff --git a/ext/standard/tests/array/array_fill_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt index 4a463a9c0e..9c1857c61d 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 d3f9e4c1e7..e0b1b5f0cd 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,11 +35,11 @@ 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"; ?> diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 341e0cf565..53e0fb5bec 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++; diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt index 94f8e39331..ba27a59c96 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 28c10ff2e6..b2a51ab2c6 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 */ diff --git a/ext/standard/tests/array/array_filter_error.phpt b/ext/standard/tests/array/array_filter_error.phpt index 3f8f51bc14..14fb78fb12 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 de782fe69b..3ea93e5602 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 bbcff3818c..f75b03cbed 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, diff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt index b23618794e..4749fe8e45 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 1aa262ba62..d47761f470 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 c4a12e661b..be00f25d8d 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 */ diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt index 03a08835b9..f8b71dc10b 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 { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index f35c321376..81d9929c15 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,13 +55,13 @@ $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" ?> diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 2e7ea77dca..665481a6c8 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,7 +39,7 @@ $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" ?> diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 25e3c94d31..efbe141fe5 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 */ diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt index 810cb89732..8fa91d824a 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 */ diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt index 81554f13e1..ed89d13d35 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 c268f5aaf6..ab8cf271b1 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 ab326b4ab6..3912162dd8 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 diff --git a/ext/standard/tests/array/array_flip_error.phpt b/ext/standard/tests/array/array_flip_error.phpt index 3aa0f98271..c193a00896 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 9fbfdf0139..98aa459362 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 diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt Binary files differindex 997c391306..8d86210f0f 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 a3ad5acd88..1f6fb5804c 100644 --- a/ext/standard/tests/array/array_flip_variation3.phpt +++ b/ext/standard/tests/array/array_flip_variation3.phpt diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt index 2420c7e00f..b8badb0caa 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 cf60dc6955..3ba0cf1aa4 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 */ diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index c1d381051a..6161d9cf0a 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 */ diff --git a/ext/standard/tests/array/array_intersect_assoc_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt index c371071b38..a06dbddefe 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 406e82a86f..ca11b7cc9b 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) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index 95631fc1ac..4f15ff48d1 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"; diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt index 59ba9048d3..274da6f7b2 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) ); diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index af7df4f35c..44eaf4d410 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. */ diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 495ec30ff9..911380c25c 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. */ diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt index 0aa109933a..3a86aa9466 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() diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt index f3e6964d7b..e40f56bed0 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 diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt index ba2f79a7ec..ca803e50a9 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 6ec8fb08d7..a287f4742f 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 338d40936e..26a491ad64 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 03661f2756..6c826c4045 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. */ diff --git a/ext/standard/tests/array/array_intersect_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt index 46f77ac9bd..373a0ddbe0 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_basic.phpt b/ext/standard/tests/array/array_intersect_key_basic.phpt index fc6e177f54..c24a4c1b08 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 9509e97b9c..10ad8ad342 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 b98832461a..fb9dd2c7aa 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt index 56e5f1494d..5d2147b99f 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation3.phpt b/ext/standard/tests/array/array_intersect_key_variation3.phpt index 00875ee9ff..dca52bafc2 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 24e649fe15..8b49ba8db1 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'), diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index c89add62ec..fb01bb9207 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -3,15 +3,15 @@ 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) ); diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index b671e11e92..da0115e368 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"; diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index 4dabf8d1b7..589893db5a 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,7 +25,7 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 5792930afc..9a84b2aead 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,22 +13,22 @@ 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=== --EXPECT-- diff --git a/ext/standard/tests/array/array_intersect_uassoc_error.phpt b/ext/standard/tests/array/array_intersect_uassoc_error.phpt index ae7acb133b..f7ee0303ed 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 d8e87e4277..064def0f5a 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"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index 9fda4da434..8f0bfd4753 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"; diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt index cf2611aeb9..c880f7a057 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 b471d93a95..4830baaf10 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"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt index 01facf2355..e18417aa02 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"); diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt index e5d0f56568..d998721bd8 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_ukey_basic.phpt b/ext/standard/tests/array/array_intersect_ukey_basic.phpt index db21b9b01e..57ed1322fe 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 bb052fbf76..793ec3d252 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 4eb2253f9b..c91a07fc3c 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 diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt index 69a6500d2f..7156bf5404 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 5bfe56065c..0688004fba 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 diff --git a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt index 1236bcd3df..d99059e52d 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 4d58cb7c2c..38e2e76134 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 diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index b512b06040..17b98bb81e 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"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 6231a657a9..6e57841457 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"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index c79277df56..6f18ba5694 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"; diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt index 89286f8986..c686899aad 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 38c91fca07..6b9a802af1 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"; diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index e171cbb7bf..9536dd8c2a 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) ); diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt index 266f9b8f89..b45e0da74f 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"; diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt index 976211deec..1db37b8467 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) ); diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index aa0f0b704a..e6d22405ba 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. */ diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 93419842cb..e019e4ef3e 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. */ diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt index 14f8cdd6d1..6626c68de2 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 */ diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt index 8534bd2a8a..e605b86bd1 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 diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt index da1088c5ed..4da1b9b7ac 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 91eae49aab..2934fe09a4 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 0dba1af6d3..6c7c956ea7 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 95ca367284..61faf0158d 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) diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 6ebaf56ded..46982b7490 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 */ diff --git a/ext/standard/tests/array/array_key_exists_error.phpt b/ext/standard/tests/array/array_key_exists_error.phpt index 8b189c80e1..1691cc5fa1 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 70fb49a725..cec69df3dc 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; diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 78c20c9c72..2b4897730c 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; diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index 2f50d3e86f..b989160db7 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 30c498768e..0b0dff3c44 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(), diff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt index e8a52a7059..0517d4c24e 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 4bf3473ef3..cbbfb5f789 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 */ diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 2144fb893c..53899c675a 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"; diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index abfba0a4c3..bcf0adfdfc 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: "; diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index 6211882222..493291bc9c 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 */ diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index 522fd67e99..b44f86b97e 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', diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index a6203fbbf5..e9944ed112 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,7 +23,7 @@ $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++; } diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index 1e7f0df4ad..8378cfbf0d 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, 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 04f574d810..dd35a77642 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, diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index b3a97a0dfb..adb2baea66 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,7 +21,7 @@ $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"; diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 081660d51b..8198a75e23 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", diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index ee37400801..e02e4095d8 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 diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index 087e3ba284..c5d78c257e 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"; ?> ---EXPECT-- +--EXPECT-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt index c98b2cf29c..7cfb528bf2 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 9424c44110..114d1d3134 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 12cf551da5..5b80126966 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 */ diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt index 6a17b299ee..e169f591c8 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 */ diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt index 5c6d9fb97a..b258c2d31b 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 d83f78cbfa..059869326d 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 */ diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt index d9440bb2c1..1cfbdd7beb 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 ef235e730c..4c85d12e88 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(), diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt index fcc4090632..d99a529e3a 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 55f1569211..e286095576 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 9b6ee42e2a..ee4c65ceb3 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,7 +25,7 @@ $arr1 = array( array('a', 'b'), array(1, 2, 'a', 'b'), array(1 => 'a', 'b' => 2) -); +); var_dump( array_map('callback', $arr1)); echo "Done"; diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt index 44ad142184..e75cec186a 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 */ diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index 245f59e745..e6a8096282 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 *** diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index fcf9131ed8..749faab6ae 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 */ diff --git a/ext/standard/tests/array/array_merge_error.phpt b/ext/standard/tests/array/array_merge_error.phpt index a017c27530..38e672e32c 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 e22208753e..efda3d531b 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 */ diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt index ce17a06b89..3cdc90e2bb 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 */ diff --git a/ext/standard/tests/array/array_merge_recursive_error.phpt b/ext/standard/tests/array/array_merge_recursive_error.phpt index d7d717297e..ffa9cc998e 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 63731d2ad7..071e9eadb5 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++; } diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 06595d5130..8e28b7434c 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"; diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt index 64eacb784f..f14d5d9bb3 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. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 8a76a67153..12d225a0d5 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -92,7 +92,7 @@ foreach($arrays as $arr1) { $iterator++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index b497acec7e..f73dd9c628 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 3b251220ea..34cdfe409f 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 22819dfb37..17fb7eb070 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. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt index 419eed5d11..45e6c7ee77 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. */ diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 255ed070aa..ff76ed959c 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) ); diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt index 59a94024f1..c35e976b5e 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. */ diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index 96996edcf4..6cec33a532 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(), diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 46403fac9e..37596f4f00 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(). */ diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt index 30a405c623..fd7e9ccfc8 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(), diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt index 717968adb8..89121dd0d0 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 ad7d7fe5dc..b995625861 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', ), diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index 143d4ca1e6..a409e28617 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 */ diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt index 3ddc068244..1d549c5647 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 */ diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt index fedf61e96e..7812bb766e 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 */ diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt index 700bbb8913..38b9142c09 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 */ diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 95daa10558..9872ac676b 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 */ diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index 7d33596630..cb2b4a4c0c 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"; diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 682543bc9f..0e5e3df684 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"; diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index f766e5fc1d..390640700c 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"; diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index 5956630f84..7dcb5c12b5 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 46d55ae065..a20a0f1151 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"; diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index 35576c481c..56fb3df582 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"; diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index 163819ef96..79ff8e99c6 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"; diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index 1ada637f0e..f34c501eec 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"; diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index 93c265922e..5e84548d7e 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 e4e9075562..17bdeae5cd 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"; diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index 86210eeb49..8c26a8347b 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 b2cdb05ece..28130e31fd 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 76eb9ab04b..562be2e70e 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"; diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 66504ca798..2953846825 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"; diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 81bd1d1acd..f5ffb8a7e4 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"; diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 996c183fcd..4ad68efe19 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"; diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 90c66a97cc..6d89dd0c6c 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"; diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt index cc4b8d147b..8d422b78c0 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 add9b3c8e5..c267516730 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 63b4c83bf0..d0dc9ccb7f 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 c4ef0f2d42..b806139d57 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 */ diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt index 69de77ee97..c95303974d 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, diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt index 75df118220..e948fce989 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_pop.phpt b/ext/standard/tests/array/array_pop.phpt index 2336d2a394..843a618f2e 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -32,13 +32,13 @@ 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"; ?> diff --git a/ext/standard/tests/array/array_product_error.phpt b/ext/standard/tests/array/array_product_error.phpt index 79f7cb4a08..3ef23b9210 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 cd2ed71ae6..b8f2013dc3 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 79821981a0..38faf712e1 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"; diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index e2b5e3efe8..cd3f24afff 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"; diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index f2b9f2bc29..c79077c78f 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"; diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt index 687ea89c38..09284d9096 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"; diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt index 829100c54c..52e754f94d 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"; diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt index ff4ab2d711..d4e7148aba 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 */ diff --git a/ext/standard/tests/array/array_push_error1.phpt b/ext/standard/tests/array/array_push_error1.phpt index ec866348b2..163c0984eb 100644 --- a/ext/standard/tests/array/array_push_error1.phpt +++ b/ext/standard/tests/array/array_push_error1.phpt @@ -3,7 +3,7 @@ Test array_push() function : error conditions - Pass incorrect number of args --FILE-- <?php /* Prototype : int array_push(array $stack[, 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_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt index 5d7b655a42..c50683b780 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 14125fcb87..c04cf4073f 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(), diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index 9e31a7628a..e61d54ee82 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(), diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt index 8b7ef48ce7..74ec771708 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 */ diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt index e5024daccf..650dd70c60 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 */ diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 903a7a5ef4..c0057268c2 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', diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt index 678892b6e0..db432dc9b4 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 diff --git a/ext/standard/tests/array/array_rand_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt index 30b5b5ce9a..46d265aa99 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 e18fede4bd..4ff93c8652 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 30cc85ae6c..2ffae12178 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 1847e60dc6..438f2d0884 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 diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt index 44967ffd8c..b2e566d12d 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++; }; diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt index 81194a135d..6c656ef55e 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 74dada0aa0..27f1620003 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 44f5cd8573..7c4043e464 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 3f1fea28cd..d60630eb32 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 9d702ebce0..4a73a8eb95 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -36,7 +36,7 @@ $initial = null; var_dump(array_reduce($array, 'reduce_null', $initial), $initial); echo "\nDone"; -?> +?> --EXPECT-- *** Testing array_reduce() to integer *** int(61) diff --git a/ext/standard/tests/array/array_reduce_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt index 954aa43d76..88070dee55 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 e4bbea8bf0..618a22282a 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"; diff --git a/ext/standard/tests/array/array_reduce_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt index 35b2d38f40..853ceb946b 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 a359d425db..099af89a9f 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"; diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt index abca4e4ae5..5ec38461a6 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"; diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt index 88a62b8573..c6844be47a 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 */ diff --git a/ext/standard/tests/array/array_reverse_error.phpt b/ext/standard/tests/array/array_reverse_error.phpt index faf7e8243f..bfa9c5130b 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 70c5d5fa3d..b2936c171c 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(), diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index e3f0254f52..88f36ea025 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 6c4c952240..dbd316ab8a 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 edbefd345f..e48673ec1d 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 diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt index 81dd55db62..49563f9712 100644 --- a/ext/standard/tests/array/array_search1.phpt +++ b/ext/standard/tests/array/array_search1.phpt @@ -18,7 +18,7 @@ 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 diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 094767dacd..6c52a3bfed 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,15 +49,15 @@ 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"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index a8bac04edb..fa43841984 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,11 +39,11 @@ $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++; } diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt index 8af089a72c..41b0b5bb20 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 95656899ce..cbbf714b6f 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -20,38 +20,38 @@ $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"; ?> diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index e030adc2bc..014240f6bb 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 */ diff --git a/ext/standard/tests/array/array_shift_error.phpt b/ext/standard/tests/array/array_shift_error.phpt index fcfb931f10..c44124df05 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 cef9af8b8a..0e1aed52d6 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(), diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt index 2b3adc605f..7f5d618e74 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 d3a359fab8..65d2c72dac 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', ), diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index 150f312e70..4ccf9478d6 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 */ diff --git a/ext/standard/tests/array/array_shift_variation5.phpt b/ext/standard/tests/array/array_shift_variation5.phpt index 58eab55247..faae551cc2 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 1840e080d2..6b271e0e48 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 */ diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt index 02af5dd4a1..7217a11a91 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 */ diff --git a/ext/standard/tests/array/array_shift_variation8.phpt b/ext/standard/tests/array/array_shift_variation8.phpt index 2f2fba5bd7..a48d907896 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 fdf932605b..0bfa2e030e 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_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt index 295d9625a0..8c32685d39 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 */ diff --git a/ext/standard/tests/array/array_slice_error.phpt b/ext/standard/tests/array/array_slice_error.phpt index 0e8f1c7571..94acd08a96 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_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt index c2b48a94f6..6a836dc1ee 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 */ diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt index 2e2bfc4fc0..bb63e9f6e5 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(), diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index 1d3be8127d..da8a00e83f 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*/ "", '', diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index 32bfc045c6..de2c3b4d28 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*/ "", '', diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt index 40bfad3332..c640ac7bd2 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(), diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt index fb632c2bf9..49e717f855 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 */ diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt index c1a673a8f7..e88939e604 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 */ diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index fd0bfd822d..1cd546e63c 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', ), diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index 011a50f9dd..99c30e09d7 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 */ diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index ecd787a069..4abd1afe82 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 */ diff --git a/ext/standard/tests/array/array_splice_basic.phpt b/ext/standard/tests/array/array_splice_basic.phpt index e96303d13a..9a96ccb362 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 bdcd9913cf..18148fbff2 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"; diff --git a/ext/standard/tests/array/array_splice_variation1.phpt b/ext/standard/tests/array/array_splice_variation1.phpt index 9ba94f6633..ecd6f67eb0 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 516339c7e8..42692918d1 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 33ec80e5a8..9c1a7c86ab 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 d1cc501c6b..ddd966780e 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 ecbc15fae6..e7c69202a3 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 */ diff --git a/ext/standard/tests/array/array_sum_error.phpt b/ext/standard/tests/array/array_sum_error.phpt index 209405d3d3..0433fca4dc 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 55b249616a..30e2847004 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"; diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt index e746238155..71abe03696 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 */ diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt index 7f1a756bec..15c11fcccf 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,7 +39,7 @@ $float_input = array( ); echo "-- Mixed float array --\n"; var_dump( array_sum($float_input) ); - + echo "Done" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt index af03d7fb7b..1b7043e56a 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"; diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt index ee1c186c18..db73114aa0 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 */ diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt index 950f2e2a20..c3a20af5ed 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"; diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt index fbc426902f..7ed8723be0 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 */ diff --git a/ext/standard/tests/array/array_udiff_assoc_basic.phpt b/ext/standard/tests/array/array_udiff_assoc_basic.phpt index d115bcc326..26c4f31761 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 ec1cc062ed..ae7c3b9586 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 f824244f6f..eca26a30e6 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"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index 108d2a3ff0..2cbc9572d2 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"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index d022a4e82f..1a2c1ed978 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"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt index e693afff87..0f4da2c29d 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 c5634dbcd7..20a5afa202 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"; diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 5eb21cd723..10afe341a3 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: */ diff --git a/ext/standard/tests/array/array_udiff_basic.phpt b/ext/standard/tests/array/array_udiff_basic.phpt index 5dbece34cc..f5348852bf 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 dc9657756e..7eb7e3b068 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 51b4bc1759..9f7e179498 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 e7d27e65db..76dbf16dba 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 e55a600e48..3bb26102b4 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"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index 73edbfe0bb..2324c5a47b 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"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt index 76afda098b..bf19c533cb 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 0beb15ff77..7be89f4c6f 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 f78261a1eb..820f0466ad 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"; diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index f8ca5300ca..4939b8eba5 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"; diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index b32324a2dd..5eb84146a1 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"; diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index 4281ffcd18..61aa1f0c9a 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"; diff --git a/ext/standard/tests/array/array_udiff_variation3.phpt b/ext/standard/tests/array/array_udiff_variation3.phpt index aeeee89bf1..294686b22a 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 1048c82cc1..a92c5ddfdf 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"; diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index a391cb4eb6..967817bac3 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"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt index d3645c7cea..a7e313ecf7 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 076dbf16fb..b9837e7954 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"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_error.phpt b/ext/standard/tests/array/array_uintersect_assoc_error.phpt index 73fc61e397..d27f9f7606 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 634d036464..a2babcdb02 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"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index eed4afa6be..8723157506 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"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt index a76fca0f5c..29d2694ddb 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 0c8973f084..33883fa24d 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"; diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index 802934b37d..34b10af344 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"; diff --git a/ext/standard/tests/array/array_uintersect_basic.phpt b/ext/standard/tests/array/array_uintersect_basic.phpt index 4965d599ba..5334b1da85 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 1b25db4345..3c7696108a 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 5e1ea1a7d9..a9d3f14adf 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 c7391eeda9..bdf503c9ed 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 de0f4ebeb5..84d4e634cf 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"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index ffe8ccfd9a..8692026fc4 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"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt index 860a1661a6..16ffec717f 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 a3963184c3..ce7eb49a64 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 432f1c5a44..d1db008416 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"; diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index 782821f4a7..6abeac09b7 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"; diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index c26ace67df..c88177018b 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"; diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index ed34d69a1c..ee52e21c72 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"; diff --git a/ext/standard/tests/array/array_uintersect_variation3.phpt b/ext/standard/tests/array/array_uintersect_variation3.phpt index 707ba113c8..a4f670addb 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 7ecf7a6395..abc33e591b 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"; diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 04051dbf5e..699188290b 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"; diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt index 91532db8c7..e24e393f8d 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 */ diff --git a/ext/standard/tests/array/array_unique_error.phpt b/ext/standard/tests/array/array_unique_error.phpt index 9da3dfcad6..256dd63ba3 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 de65d0cf35..cc9a695c86 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. */ diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 470cd284d0..bbeb9e4fa8 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,7 +77,7 @@ foreach($inputs as $input) { var_dump( array_unique($input, SORT_STRING) ); $iterator++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index 49103c8154..95cd1887d1 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 a1fc13e94d..752ebf54ea 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 acb94b4db0..bcf6d8a6de 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. */ diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt index 65bdb421a5..334a0d0468 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. */ diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt index 4135f98d97..98712fba3f 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 */ diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt index 8b67adfbab..d8a318dd93 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_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt index ebcf19041f..9b474277a9 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 c041a47756..9c3c1b6226 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 */ diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index eec6412042..eae951027a 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 */ diff --git a/ext/standard/tests/array/array_unshift_error.phpt b/ext/standard/tests/array/array_unshift_error.phpt index 3eeb3eb750..d37abb22e0 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 ...]) - * Description: Pushes elements onto the beginning of the array + * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ diff --git a/ext/standard/tests/array/array_unshift_object.phpt b/ext/standard/tests/array/array_unshift_object.phpt index e6155373dd..856c4ed85a 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 f1301e0293..f80fc0ebc6 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) ); diff --git a/ext/standard/tests/array/array_unshift_variation2.phpt b/ext/standard/tests/array/array_unshift_variation2.phpt index 064309b53f..8339043dd4 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 9e955f7ca0..3c0e0a3400 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 */ diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index 25c9159a11..64bf3a8d82 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 7f083694af..0cc3064864 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 1660442094..a3e2cad516 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 diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index a54e2ce9f5..95b58132d5 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++; diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index a184ec44c2..66955b906d 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); diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index 89d867df92..2141e57e2e 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++; diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt Binary files differindex ba24e90eb5..b490684333 100644 --- a/ext/standard/tests/array/array_values.phpt +++ b/ext/standard/tests/array/array_values.phpt diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index a26a767b40..0a874d2927 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 */ diff --git a/ext/standard/tests/array/array_values_error.phpt b/ext/standard/tests/array/array_values_error.phpt index 07d682c9e1..40256185a1 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 82e5e04956..4f723c2b3b 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 diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt index 15da1a621e..15eb77dac0 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 ba6649695d..19d45ee54b 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(), diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt index c7e9ad3f71..81e575494b 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 d036cfdebe..905dc52ad4 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', ), diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index 3fac7b44c9..8aa54f921d 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 */ diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt index 4fc4b011cf..481e34bf63 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 */ diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index b4ead80b3e..59187c7c7d 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 */ diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt index cfa600c3c5..99866bb06b 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 */ diff --git a/ext/standard/tests/array/array_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt index 8b1e2c0b0e..066d35da84 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 d3ef3750b0..7cd8a8cf7a 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_basic1.phpt b/ext/standard/tests/array/array_walk_basic1.phpt index e4bdf1b895..bb106b1fba 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 3ef15605e7..ee5b4e9925 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 846e8a01af..0a5d854582 100644 --- a/ext/standard/tests/array/array_walk_closure.phpt +++ b/ext/standard/tests/array/array_walk_closure.phpt @@ -93,7 +93,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt index 334dfe4ef7..fb77e92e8a 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 fd3cbf5037..a4026180fb 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 3bd83fdab2..cd06ea3096 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 97606a6592..3994269378 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,7 +73,7 @@ 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" ?> diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt index f9214d25a5..fc04304fc5 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 d2fa9b86eb..a83c227a3b 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_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt index 07f09c5263..962f133e4c 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -30,7 +30,7 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d NULL diff --git a/ext/standard/tests/array/array_walk_recursive_basic1.phpt b/ext/standard/tests/array/array_walk_recursive_basic1.phpt index df192b6a79..606861565c 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 a049c0b812..ac5c35440f 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 75966e8833..b149eecbfd 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 5a077c6886..b162a1c9dc 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 5c01c55817..0bfbeee067 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 87d8e49d95..b379e663fc 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,7 +75,7 @@ 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" ?> diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt index 5b8c0b1d1d..56abaca83d 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", diff --git a/ext/standard/tests/array/array_walk_recursive_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt index bef44b59ad..5c8c56dcc2 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 96c93d6f35..a6d623b011 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,7 +58,7 @@ $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" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt index a7cf93bd9a..3540421f2c 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"; diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt index 4db5989582..ce85fe7e4b 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 */ diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt index fdda065904..dea712e5b4 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); diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt index bc0d205900..06dc1aaa09 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 671fcdb375..2db8067fe0 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 780d779a7e..f436ea206f 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,7 +46,7 @@ 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" ?> diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt index 4121f1a5a1..5fc3e62f2a 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", diff --git a/ext/standard/tests/array/array_walk_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt index 5cfee36cb4..1780f66bae 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 964853705c..ff466e5280 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,7 +58,7 @@ $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" ?> --EXPECT-- diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt index c495f2acfc..d141bc20f7 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"; diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt index c80cfba44f..e36ab88efc 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 */ diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt index 5392618c17..8fe16362aa 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); diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt index 692f276628..671ad44309 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 56a60e6b0f..829baf1add 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 3af6316c12..e1bee47998 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,7 +46,7 @@ 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" ?> diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index 598fe6aab3..4f63b6920e 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"; diff --git a/ext/standard/tests/array/arsort_error.phpt b/ext/standard/tests/array/arsort_error.phpt index 676d8265ed..5a24815697 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 f73696392e..75cee2de5b 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 f5ed333623..338c852446 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 c32e377295..1310590f56 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 ++) { diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index 0520e455c6..27ab476bd9 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 ); diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt Binary files differindex b669cf078f..aa6f33ae6b 100644 --- a/ext/standard/tests/array/arsort_variation11.phpt +++ b/ext/standard/tests/array/arsort_variation11.phpt diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt index b716b65793..e6674774ee 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++; } diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index 765efe874d..9f8d47f47c 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 b52d3a16a2..d572e4cdaa 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"; diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index b7adf76eab..ea3fc18b7c 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" ) diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index ff85223ef4..ff4704c404 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 diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt index d65f11ce98..3c8b6206c2 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 */ diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index d190408d54..a8daa349d4 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; diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt index 61c532e4d8..07c7f1be51 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"; diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt index 03c696499b..96bf469484 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"; diff --git a/ext/standard/tests/array/asort_error.phpt b/ext/standard/tests/array/asort_error.phpt index ef2329585b..821663fa64 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 ad54675d64..21984de67e 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 be761205b2..8f2a666146 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 07fc53787b..4594a3d171 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 ++) { diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index 793315e999..4b9ccd2f51 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 ); diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt Binary files differindex a1db5cbdf7..c32c96cbf6 100644 --- a/ext/standard/tests/array/asort_variation11.phpt +++ b/ext/standard/tests/array/asort_variation11.phpt diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt index f58663cdaa..e8dda190df 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++; } diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index a9d3f6afa3..4ad106b658 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 088e58a3da..6dd60e3e7e 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"; diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index e416a59ca6..c7ca503aea 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" ) diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt index a25e96fd64..3d879c1b3b 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 diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt index a32c0de859..892dd82238 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 */ diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt index b097346dff..ec02224617 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; diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt index f3c27ef94a..f371a07daf 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"; diff --git a/ext/standard/tests/array/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt index aa52dc590a..e1bb0033ea 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 dcede511bb..7993ac2576 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 b1cd523026..a1a30afb6d 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 b9e04fd67f..6c97562f6c 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/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 7720fe0006..289e802c00 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 728a659d8f..c79c33fa74 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 e54b984fd0..0153da90bd 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 eb5b85e700..44710b0426 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECT-- +--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 12aa35c347..5200fa86a6 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECT-- +--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 9250c03e10..f858bf107b 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 efd791ac99..5caf48c6ee 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 e3f5386482..07138f138d 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 d7abc7773b..be48ca8570 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 7912fffca4..67a34325d0 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 42f7a6ab54..5480109ba2 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 f94aa3a2be..bb58e79183 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/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt index 7e132ba3d4..93836d0398 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 a03bdaf4ce..b2d133ef13 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 9f1384eddd..4c41607d34 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 3baec831bd..16063bbdfc 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 8b8f3a6edb..522ff1903b 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/bug48484.phpt b/ext/standard/tests/array/bug48484.phpt index 0b4afe277a..5688c0cad8 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/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 9db2c7796f..aac0e2a535 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'); diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index a501986981..70b602256b 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'); diff --git a/ext/standard/tests/array/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt index 1f0f6fe630..f5e06a4a02 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 e5c9dfc5e6..8ed4c5081b 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 91c5b080a9..fbee975d17 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/bug70713.phpt b/ext/standard/tests/array/bug70713.phpt index 4e2792ab4b..7cd0a0f113 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 28b5c08a8a..49e5bb7719 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/compact_error.phpt b/ext/standard/tests/array/compact_error.phpt index a7ef54597e..9216ac9ba6 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/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 010d6cdf3c..f5cff97e0b 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 */ diff --git a/ext/standard/tests/array/count_error.phpt b/ext/standard/tests/array/count_error.phpt index 76f7213645..32d15edc6f 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 edec9fbe3f..175cfe7118 100644 --- a/ext/standard/tests/array/count_recursive.phpt +++ b/ext/standard/tests/array/count_recursive.phpt @@ -1,5 +1,5 @@ --TEST-- -Test count() function +Test count() function --FILE-- <?php /* Prototype: int count ( mixed $var [, int $mode] ); diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt index a58473c219..5152f65445 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 86a2b0108f..0a654be183 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(), diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt index 9c89bcd16b..30cae18964 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 */ diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt index f2a6aad78e..287a479067 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 */ diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt index 2cc78fc624..c6c66f43c9 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(), diff --git a/ext/standard/tests/array/current_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt index 49769cea3f..d839370962 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_variation6.phpt b/ext/standard/tests/array/current_variation6.phpt index 970c7d4045..d7fb0dccb1 100644 --- a/ext/standard/tests/array/current_variation6.phpt +++ b/ext/standard/tests/array/current_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test current() function : internal pointer maintenance at the end of array +Test current() function : internal pointer maintenance at the end of array --FILE-- <?php $array = ["foo" => 1, "bar" => 2, "baz" => 3]; diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt Binary files differindex f1b6f76ea6..74e571160e 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 b12b4c19f7..cd38682dc7 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 0806bee674..88055ce589 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 becdfc4545..a9e27cf3f9 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 73b1ba2746..e3dff968ff 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 375615643f..8a0773f0b5 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 14b5536135..7cddd3e5c3 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 b6c39538a3..b06e344eb8 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 ba0f2657c8..c36f9bb881 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 3dfe1e821e..dc3f2eb75e 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) ); diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index fbda85ea01..6b9e07ff74 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) ); diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index 2e92587068..b14cc2f836 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 */ diff --git a/ext/standard/tests/array/end_error.phpt b/ext/standard/tests/array/end_error.phpt index 96e8429558..9673a128ad 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 a6f5ac1d1b..2b7f4cd9d4 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(), diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt index ea9c336ac0..43972b751e 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 */ diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt index cbc30212cd..fbeea68a12 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 */ diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt index d7e5fd7ac5..46b71a1466 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 diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt index 0e66c0e091..0560e9e9c9 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 2170b4f6b4..078a7e8c40 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'); diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt index 039d474f89..c8238050ae 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'); diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 5483fa0c9d..a0dcdf9673 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,7 +27,7 @@ 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")); } diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt index 1a6a088646..a858c597b5 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,7 +27,7 @@ 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")); } diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt index 31adb6e814..d755a6a214 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,7 +27,7 @@ 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")); } diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt index f4455e9e57..91867b1112 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,7 +26,7 @@ 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")); } diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt index 0c2243949a..fba1e97b83 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 diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt index 8104450df2..1502a52380 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 diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index de9271a1cb..a5e3a00eb6 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 diff --git a/ext/standard/tests/array/extract_variation9.phpt b/ext/standard/tests/array/extract_variation9.phpt index 4d42a69762..1d4518bdf4 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 193b976e94..cef3fdf446 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 */ diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt index 45f18d0a10..bddffa6058 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,15 +50,15 @@ 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"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index 1f42bb3f07..0815e3ee94 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,11 +39,11 @@ $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++; } diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index c8b6445cd1..f07d1dea89 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 8301571940..186eb2718d 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -4,7 +4,7 @@ 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 */ @@ -23,38 +23,38 @@ $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"; ?> diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index c626fd6872..2b45124921 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) diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt index ebb5c25dd2..510ec09dcc 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -6,7 +6,7 @@ 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)); --EXPECT-- diff --git a/ext/standard/tests/array/key_exists_error.phpt b/ext/standard/tests/array/key_exists_error.phpt index 1bbd41e20e..a1af3910ba 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 65031f8240..490d564246 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -6,7 +6,7 @@ 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'])); --EXPECT-- diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index 3409f36455..a6f82181d3 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,21 +38,21 @@ 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)); --EXPECT-- diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt index 9beb03e76b..12a97e1421 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(), diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index 912f9a69cb..cf7ca37531 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', ), diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index 916e99af38..2d5387e56e 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 */ diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt index 6698d6385a..a7fa8d7bf9 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 */ diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 6a3a40e3ad..16b7e0ca4c 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"; diff --git a/ext/standard/tests/array/krsort_error.phpt b/ext/standard/tests/array/krsort_error.phpt index 1bca5f928d..250d9da03b 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 6236595796..308be2cc26 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 86d6a3eacb..8b44de314e 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 ++) { diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index 467fb88e4d..c22656d173 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!!!" ); diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index fc113ff30a..95080b5507 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++; } diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index 0707c610cb..506b0cfa57 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,20 +40,20 @@ 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"; ?> diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt index 5643b39f58..dbbac1e85a 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 */ diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index 2fa16c6e73..3af411135c 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" ) diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index 72f4e41720..357fb5c1a0 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 ); diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index b0512935dc..14a3310a65 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) ); diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt Binary files differindex 3dd33157ec..67a402a8df 100644 --- a/ext/standard/tests/array/krsort_variation8.phpt +++ b/ext/standard/tests/array/krsort_variation8.phpt diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index f3e510f8be..5317228931 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"; diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index 59241bb6c8..66b213d8c9 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"; diff --git a/ext/standard/tests/array/ksort_error.phpt b/ext/standard/tests/array/ksort_error.phpt index f2b102ae01..7631e9ee0e 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 2d76026aa4..e193032788 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 d11c9a5290..185fac760c 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 ++) { diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 844685b36a..1a1a719b53 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 ); diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 758821303b..2c93512fea 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!!!" ); diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index fb1371a985..c80541ea27 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++; } diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index 691672f780..3159a36be5 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,20 +40,20 @@ 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"; ?> diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index bc0c4be3b8..7951c45eb5 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" ) diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 32fd973d8f..0e6d8fe372 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 ); diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index 18dc3a03ab..4b1f509c3c 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) ); diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt Binary files differindex ca9dfdbe9e..bedbeeed7c 100644 --- a/ext/standard/tests/array/ksort_variation8.phpt +++ b/ext/standard/tests/array/ksort_variation8.phpt diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index e78ea3bef0..be58e6d589 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"; diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt index 555d2d04c8..ae4f304eae 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 f304212293..c880810cb3 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 1eb7e31cdc..95116b16c2 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 b20a3c08f6..a8736a3d88 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 a32ceb8fc2..44fa010c31 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 9abcda53c3..a020d5e422 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 3a77ee8a0d..cb8c7cfdca 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 34f853fedb..f76770f40d 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 52f63f3916..526d77a27a 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 dc472bc258..deb84f276d 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 9e24bd66a1..a9c31f615f 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 a8b215209f..eff810e869 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 ba23353503..539fa424fb 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) diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt index aab98a45d8..ec733adaf9 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 1537550f4c..778d265b85 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(), diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index ac19cb3950..531f4ecfab 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() diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt index 8a05c12f93..a38dbedfe4 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 be7495418d..6376524d5b 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) ); diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt Binary files differindex dc5b5f4203..7b806f3977 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 e502d8646e..2813f7c514 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 */ diff --git a/ext/standard/tests/array/next_error.phpt b/ext/standard/tests/array/next_error.phpt index f7b78357cb..11e7cb12de 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 027a521471..405f34a435 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(), diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt index 1ecde7efce..aff03a619a 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 */ diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt index f3c91cafc3..8e1703259e 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 */ diff --git a/ext/standard/tests/array/prev_error1.phpt b/ext/standard/tests/array/prev_error1.phpt index bea245196e..0b9b15814e 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 851cf0a949..37049cf854 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 dfac24eacb..8f91507131 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 257206b410..01156d8239 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(), diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt index 8e8ee4d673..e4c707124c 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 */ diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt index ebb496c74a..562335d099 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,19 +29,19 @@ 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) ); diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt index 45c30f5acf..b63e9874bf 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/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index 52e3cf55f4..04c676a4cf 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 */ diff --git a/ext/standard/tests/array/reset_error.phpt b/ext/standard/tests/array/reset_error.phpt index c71608112c..abab8af635 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 6181bd4177..f273324902 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(), diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt index 6ecc1ad683..e155cad592 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 */ diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt index 7ac859c1c3..ff17a0cc9e 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 */ diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index 724aa2d3a8..e838a9ce92 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 ); diff --git a/ext/standard/tests/array/rsort_error.phpt b/ext/standard/tests/array/rsort_error.phpt index 6f6f2f9762..247ec79cb2 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 98f7cfec16..dbaf1751f0 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 57acdc61fe..75a8fbb7ab 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 ab05a250c6..ebc3991edd 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(), diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt index bcb184e84e..eb1326a546 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 */ diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt Binary files differindex 076a906599..5c851b4c4c 100644 --- a/ext/standard/tests/array/rsort_variation11.phpt +++ b/ext/standard/tests/array/rsort_variation11.phpt diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt index 8b4a5074e4..b6b9c68bbe 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; }; diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index 6f92407587..dbd1a27820 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,20 +42,20 @@ $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"; ?> diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index 08ce8a66d5..75d8c8bb56 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"; diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index 62e9f10aef..2821d21224 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); diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index d593573adb..71280710d0 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"; diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt index 14eab635d0..f6f92c7ccd 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 */ diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index 28bfe2c5a5..2cf8dc77f5 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) ); diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt index 9d0d917b88..d3b44ec0bb 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"; diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/shuffle_basic1.phpt index d601f5433c..e29dec9220 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 cb127d23ef..8977e349f9 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 833b390363..27bf260949 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 2f578be11b..9a580959e8 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 */ diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt index a0cb6b632e..b0394338ea 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 1cb4e4d1eb..68dad4a471 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 399197c19b..2b5f80b71e 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 ca2c1ac90e..e7a7db1be5 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 ac86cbf8d7..c292199cb9 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 bbcbe11091..a76e54d70a 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"; diff --git a/ext/standard/tests/array/sizeof_error.phpt b/ext/standard/tests/array/sizeof_error.phpt index c6274830cf..3a9ce1b629 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_object2.phpt b/ext/standard/tests/array/sizeof_object2.phpt index 404443ae59..c81018f635 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 5917a798e1..e98c334267 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 8bd74a0207..1bc815d7c4 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,7 +56,7 @@ for($i = 0; $i < count($values); $i++) $counter++; } - + echo "Done"; ?> --EXPECT-- diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt index b78b620d7d..cb77e07323 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]) diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 63fc05bd46..465b818174 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 d608dbbe1b..905505fa06 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++; diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index df37b2d1d5..1f9c8f099f 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 ); diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt index 4864ef33df..7c7ecb1105 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 caa9c8dbb6..a55a0962a8 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 93b0fa2e8b..7e13cf8abf 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 f778b81907..9eca22c680 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 ++) { diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt index 9f76968a03..1ff71a3dc5 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 */ diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt Binary files differindex 4faec0196b..0806ab6816 100644 --- a/ext/standard/tests/array/sort_variation11.phpt +++ b/ext/standard/tests/array/sort_variation11.phpt diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index 3ee1784edc..02e6af21af 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++; diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt index 1ad058d4e9..3aec6dcdb1 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 f4f6d783c1..56b25223bf 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"; diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt index 0395d0c97f..f5f1987458 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") ); diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt index cf094e864b..7d7fdeb410 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"; diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt index f61ee46e54..48d4a48758 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 */ diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt index 17228f28ac..87134716ca 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; diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt index 53e5679600..bf7d03191d 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"; diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt index c0dfefd836..160af2c328 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 */ diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt index de0275c15a..af9c624d74 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 */ diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt index cc2dd3a217..a517e4a511 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 020b0d3c0b..c357e07490 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 diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt index b6862b7588..26fa6f11b4 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 c8475f9112..f3a849b938 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, ); diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index 15b62930c3..7b6188b420 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; diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt index c0afb8df5f..c8d3a81d83 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) { diff --git a/ext/standard/tests/array/uasort_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt index 6283245410..e5278fbab7 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 8fe5f27821..bcb5d41fab 100644 --- a/ext/standard/tests/array/uasort_variation3.phpt +++ b/ext/standard/tests/array/uasort_variation3.phpt diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt index 613edd4684..75772442a8 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 */ diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt index e6996a55fe..b398d62709 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 46d5e24aa4..26eb1e1dab 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 */ diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt index 48028dbcd8..72520b2eb8 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 */ diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt index dd0a7a3913..2bb2b46512 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 b8c5598d84..38aa32b2e5 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 diff --git a/ext/standard/tests/array/uksort_error.phpt b/ext/standard/tests/array/uksort_error.phpt index 241ed2f828..db9fdea088 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 b2214a5880..21210dee7b 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"; diff --git a/ext/standard/tests/array/uksort_variation2.phpt b/ext/standard/tests/array/uksort_variation2.phpt index 2f5b8b5d89..5ac32f02b8 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 2762ebd830..08774c09a4 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 64351f707c..f5a8e7579d 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 */ diff --git a/ext/standard/tests/array/usort_error1.phpt b/ext/standard/tests/array/usort_error1.phpt index 70c555e346..222b9c62a6 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 7bf0f659e0..d0ccd36221 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 0e87443d1c..8fccc49047 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 00d302f35b..3226741da4 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 761efbca39..18673f0245 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(), diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index 0aeed40292..be5a1b0969 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"; diff --git a/ext/standard/tests/array/usort_variation2.phpt b/ext/standard/tests/array/usort_variation2.phpt index 70d21649ce..fa5d463ade 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 5d21776060..88ae8afe4b 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, ); diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index a5d14daab2..1335279708 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); diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index 922321c237..b8660e1438 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 10b1e9929d..473f61a0dd 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 */ diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt index 55c4efa037..a493ac752c 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 */ diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt index 87107f8009..ab3532e8a7 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 977c709149..8035c57b13 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; |