diff options
Diffstat (limited to 'ext/standard/tests/array')
35 files changed, 41 insertions, 39 deletions
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index f88f8763f..7b3bba226 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -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 arguement: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 03de63290..1381fe0f4 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -29,7 +29,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index 8623f8e6c..309c9ca07 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -16,7 +16,7 @@ $heredoc = <<<HERE_DOC Hello HERE_DOC; -// array of possible valid values for 'val' arugment +// array of possible valid values for 'val' argument $values = array ( /* 1 */ NULL, diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt index 31a03e7f5..012a729d6 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) ); echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n"; var_dump( array_fill_keys($keys) ); -echo "\n-- Testing array_fill_keys() function with no argumets --\n"; +echo "\n-- Testing array_fill_keys() function with no arguments --\n"; var_dump( array_fill_keys() ); echo "Done"; @@ -38,7 +38,7 @@ NULL Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d NULL --- Testing array_fill_keys() function with no argumets -- +-- Testing array_fill_keys() function with no arguments -- Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d NULL diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index 9e1f50c68..13b566a7d 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -17,7 +17,7 @@ $heredoc = <<<HERE_DOC Hello HERE_DOC; -// array of possible valid values for 'val' arugment +// array of possible valid values for 'val' argument $values = array ( /* 1 */ NULL, diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index 50be08059..e3f0ae08e 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt @@ -31,7 +31,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index ed2e3d951..9eb342f8e 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -31,7 +31,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index b2b7d8ac0..c404e58ba 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -30,7 +30,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 4f1d6f3dd..66624a66c 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -30,7 +30,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index f433e1256..37ac0f8ec 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -114,7 +114,7 @@ var_dump(array_key_exists("print_member", $key_check_obj)); // not found, its a var_dump(array_key_exists("arr", $key_check_obj)); //found, public member var_dump(array_key_exists("var", $key_check_obj->arr)); //found, key is in member array -/* error condition, first arguemnt as object */ +/* error condition, first argument as object */ var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index b718386da..30830de2b 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n"; var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34)); echo "\n*** Testing error conditions ***"; -/* Invalid argumens */ +/* Invalid arguments */ var_dump(array_merge()); var_dump(array_merge(100, 200)); var_dump(array_merge($begin_array[0], $begin_array[1], 100)); diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 722388a01..76bf91391 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -30,7 +30,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt index 2f97e3ee5..a49157390 100644 --- a/ext/standard/tests/array/array_pad_variation6.phpt +++ b/ext/standard/tests/array/array_pad_variation6.phpt @@ -31,7 +31,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 3cfcfba2b..757dd6e05 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -29,7 +29,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index a667e6da0..b6440f899 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -33,7 +33,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<<EOT hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt index e856b580b..3ef15605e 100644 --- a/ext/standard/tests/array/array_walk_basic2.phpt +++ b/ext/standard/tests/array/array_walk_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt index 654637ab5..63c5f51ee 100644 --- a/ext/standard/tests/array/array_walk_error2.phpt +++ b/ext/standard/tests/array/array_walk_error2.phpt @@ -25,7 +25,7 @@ echo "*** Testing array_walk() : error conditions - callback parameters ***\n"; var_dump( array_walk($input, "callback1") ); var_dump( array_walk($input, "callback2", 4) ); -// expected: Warning is supressed +// expected: Warning is suppressed var_dump( @array_walk($input, "callback1") ); var_dump( @array_walk($input, "callback2", 4) ); diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt index c71d92b45..a049c0b81 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt index d628e9327..8e0c8829e 100644 --- a/ext/standard/tests/array/array_walk_recursive_error2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt @@ -25,7 +25,7 @@ echo "*** Testing array_walk_recursive() : error conditions - callback parameter var_dump( array_walk_recursive($input, "callback1") ); var_dump( array_walk_recursive($input, "callback2", 4) ); -// expected: Warning is supressed +// expected: Warning is suppressed var_dump( @array_walk_recursive($input, "callback1") ); var_dump( @array_walk_recursive($input, "callback2", 4) ); diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index 1545abe34..bff8d4130 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of arsort() -// when $array arugment is supplied with different values from $unexpected_values +// 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"; diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt index b85653052..ddfe319a4 100644 --- a/ext/standard/tests/array/arsort_variation2.phpt +++ b/ext/standard/tests/array/arsort_variation2.phpt @@ -70,7 +70,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of arsort() -// when $flag arugment is supplied with different values from $unexpected_values +// when $flag argument is supplied with different values from $unexpected_values echo "\n-- Testing arsort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 5420f0524..67eb5bf21 100644 --- a/ext/standard/tests/array/asort_variation1.phpt +++ b/ext/standard/tests/array/asort_variation1.phpt @@ -74,7 +74,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of asort() -// when $array arugment is supplied with different values from $unexpected_values +// 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"; diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt index 6cce64433..138e12453 100644 --- a/ext/standard/tests/array/asort_variation2.phpt +++ b/ext/standard/tests/array/asort_variation2.phpt @@ -70,7 +70,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of asort() -// when $flag arugment is supplied with different values from $unexpected_values +// when $flag argument is supplied with different values from $unexpected_values echo "\n-- Testing asort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt index e672a10b2..da7a9ec90 100644 --- a/ext/standard/tests/array/bug31158.phpt +++ b/ext/standard/tests/array/bug31158.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #31158 (array_splice on $GLOBALS crashes) +--INI-- +error_reporting = E_ALL --FILE-- <?php function __(){ diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt index eb0c71200..7e132ba3d 100644 --- a/ext/standard/tests/array/bug40709.phpt +++ b/ext/standard/tests/array/bug40709.phpt @@ -2,7 +2,7 @@ Bug #40709 (array_reduce() behaves strange with one item stored arrays) --FILE-- <?php -function CommaSeperatedList($a, $b) { +function CommaSeparatedList($a, $b) { if($a == null) return $b; else @@ -12,10 +12,10 @@ function CommaSeperatedList($a, $b) { $arr1 = array(1,2,3); $arr2 = array(1); -echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n"; -echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n"; -echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n"; -echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n"; +echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n"; +echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n"; +echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n"; +echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n"; echo "Done\n"; ?> diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index e4cbaf8d2..fa13242a0 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -72,7 +72,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when $array arugment is supplied with different values from $unexpected_values +// 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"; diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index 137620247..d193589de 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index d8c037fa9..37a35d1c0 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -72,7 +72,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when $array arugment is supplied with different values from $unexpected_values +// 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"; diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index 4969844e7..102c1c1eb 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index a2ab2eedf..b56682c31 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -19,7 +19,7 @@ echo "*** Testing sizeof() : basic functionality ***\n"; $int_array = array(1, 2, 3, 4); $string_array = array("Saffron", "White", "Green"); -$indexed_array = array("Agression" => "Saffron", "Peace" => "White", "Growth" => "Green"); +$indexed_array = array("Aggression" => "Saffron", "Peace" => "White", "Growth" => "Green"); $mixed_array = array(1, 2, "Aggression" => "Saffron", 10 => "Ten", "Ten" => 10); echo "-- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --\n"; diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index a2462757d..cb8fecc82 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -54,7 +54,7 @@ $values = array ( /* 20 */ $fp ); -// loop through the each element of the $values array for 'var' arugment +// loop through the each element of the $values array for 'var' argument // and check the functionality of sizeof() $counter = 1; foreach($values as $value) diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index f6991bdf6..9243de08e 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -73,7 +73,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of sort() -// when $array arugment 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"; diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index 7cb8ed642..af3deba4b 100644 --- a/ext/standard/tests/array/sort_variation2.phpt +++ b/ext/standard/tests/array/sort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of sort() -// when $flag arugment is supplied with different values +// when $flag argument is supplied with different values echo "\n-- Testing sort() by supplying different unexpected values for 'flag' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt index 820ab5847..cc2dd3a21 100644 --- a/ext/standard/tests/array/uasort_error.phpt +++ b/ext/standard/tests/array/uasort_error.phpt @@ -50,7 +50,7 @@ var_dump( uasort($array_arg) ); echo "-- Testing uasort() function with non-existent compare function --\n"; var_dump( uasort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "-- Testing uasort() function with non-existent compare function and extra argument --\n"; var_dump( uasort($array_arg, 'non_existent', $extra_arg) ); diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt index 308199fc1..7bf0f659e 100644 --- a/ext/standard/tests/array/usort_error2.phpt +++ b/ext/standard/tests/array/usort_error2.phpt @@ -36,7 +36,7 @@ $extra_arg = 10; echo "\n-- Testing usort() function with non-existent compare function --\n"; var_dump( usort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "\n-- Testing usort() function with non-existent compare function and extra argument --\n"; var_dump( usort($array_arg, 'non_existent', $extra_arg) ); ?> |