diff options
Diffstat (limited to 'ext/standard/tests')
2010 files changed, 3591 insertions, 3599 deletions
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 9257ce951b..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" ), diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index 4e046dfbed..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 @@ -23,7 +23,7 @@ $basic_arrays = array ( $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", @@ -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"; 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_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt index 1f1120ef14..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 */ 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 4ca3f398b4..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 */ 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 e04b32f89a..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 */ @@ -49,7 +49,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), 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_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index 8a5c5726b1..b84b0871f4 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -24,7 +24,7 @@ $input_arrays = array ( // 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) ); diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index 030324c320..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]) 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 66e431c0e8..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,8 +18,8 @@ $size = 2; // input array $input_array = array ( - "array1" => array(), - "array2" => array(1, 2, 3), + "array1" => array(), + "array2" => array(1, 2, 3), "array3" => array(1) ); 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 e761a72822..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"; diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index 3d20531704..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 */ @@ -22,8 +22,8 @@ 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], + "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 9fd3852830..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. */ 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 a02868362b..8aaf445f93 100644 --- a/ext/standard/tests/array/array_count_values2.phpt +++ b/ext/standard/tests/array/array_count_values2.phpt @@ -11,9 +11,9 @@ $array1 = array(1, "rabbit", "foo", "Foo", - TRUE, - FALSE, - NULL, + 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 2d41fd7bc1..c66c2a4718 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 2368973e12..3eb92b49d4 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -1,9 +1,9 @@ --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: */ 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 c930dd5951..89277f787a 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.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 diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index 79aae55d4f..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 */ diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index 566d89973e..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 diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt index 80278ed9a5..36d31b078b 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt @@ -3,9 +3,9 @@ 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 */ /* @@ -33,7 +33,7 @@ $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 diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 047fe9ede1..d0f70580ff 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -4,9 +4,9 @@ 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 */ /* 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 4d519b00f2..b8894e5d7e 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -3,14 +3,14 @@ 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 */ 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 52d3a2e98b..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 */ @@ -22,7 +22,7 @@ $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), dupli $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '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 55964711e3..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 */ 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 4b8a662930..80755540f5 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index e82f1759d4..0885cfeacf 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 71fb9881a1..a081571930 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index 72da179f6d..3b255b8b19 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index bbe3921ca0..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 */ @@ -25,7 +25,7 @@ $array2 = array ( '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 4af3023c03..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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index 6d03dc5fa9..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 */ diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 1b18d37d7b..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 */ 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 eb4833bc75..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 */ 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 8d0a5cffc9..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 */ @@ -25,7 +25,7 @@ $array2 = array ( '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 713967c9c1..1131922fc8 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index d76bae5232..16ba89e9f1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index cf0e3e221d..0048bbb3fa 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index d75aac0715..5fdb0d4e24 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index 1349db4adf..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 */ diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index ec9291f9f8..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 */ diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index 3d76714ca7..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 */ diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 08f921c38d..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 */ diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index 17c8db1c35..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 */ diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index 67b978845d..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 */ diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 392715657c..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 */ @@ -21,7 +21,7 @@ $array_index = array('a', 'b', 'c', 0 => 'd', 'b'); //duplicate key (0), dupli $array_assoc = array ('2' => 'c', //same key=>value pair, different order '1' => 'b', '0' => 'a', - 'b' => '3', //key and value from array_index swapped + '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 0ac3d08bc9..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 */ 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 e4aba5f0f7..59a2301c11 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index ea27fbdf77..234aa6ef69 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index 368a3c8729..de62bf4b30 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt index aac8915935..6d37a916ba 100644 --- a/ext/standard/tests/array/array_fill_keys_variation3.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index 20ba8248f9..086a10df2a 100644 --- a/ext/standard/tests/array/array_fill_keys_variation4.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt index bed1cc210f..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,7 +78,7 @@ 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"; @@ -135,7 +135,7 @@ class Child_test4 extends Test4 } } -// abstract class with public, private, protected members +// abstract class with public, private, protected members abstract class AbstractClass { public $member1; @@ -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 54ec0ec880..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; diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt index 9872d256fa..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; diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt index 0d1ec464b7..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; diff --git a/ext/standard/tests/array/array_fill_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt index 96531197ea..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; diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index d469774026..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"; diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index 5253fb4c1f..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,12 +13,12 @@ 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(), @@ -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; 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 2126b4c482..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 */ @@ -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 c9c1ab7564..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 */ 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 45ac232aed..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 */ diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index af83fcbc94..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 */ diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index 108f474513..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 */ 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 c2c29b2952..ab8cf271b1 100644 --- a/ext/standard/tests/array/array_flip.phpt +++ b/ext/standard/tests/array/array_flip.phpt @@ -6,9 +6,9 @@ $trans = array("a" => 1, "b" => 1, "c" => 2, "z" => 0, - "d" => TRUE, - "E" => FALSE, - "F" => NULL, + "d" => TRUE, + "E" => FALSE, + "F" => NULL, 0 => "G", 1 => "h", 2 => "i"); diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index a081a81939..3912162dd8 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -1,9 +1,9 @@ --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 */ 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 8df3a11eea..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 */ 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 405e518b63..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 */ 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_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_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_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 9ffbaac77a..ca803e50a9 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt @@ -68,7 +68,7 @@ $arrays = array ( // 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, + "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_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 48a502fcc4..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 */ 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 396248728a..8b49ba8db1 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index cf53919256..fb01bb9207 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index fa6bf02776..da0115e368 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index 2698681d8e..589893db5a 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index 29d1f3ba7e..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 */ @@ -25,7 +25,7 @@ $array2 = array ( '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 ) ); 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_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 1d449e8fb0..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 */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index ab3e7d14b4..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 */ 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 79bf2b07af..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 */ 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 82ac583131..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 */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index 10e5b7f099..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 */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 6f5431b1b6..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 */ diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 96fef2a48d..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 */ 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 5094d54435..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 */ diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index f6836c1bda..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 */ 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 932841107e..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 */ 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 c6e12512f1..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 */ @@ -65,7 +65,7 @@ $arrays = array ( ); // 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 de13518ade..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 */ @@ -65,7 +65,7 @@ $arrays = array ( ); // 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 74d1c833e7..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 */ diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index c1d1cc2e8f..61faf0158d 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -2,11 +2,11 @@ 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. */ @@ -22,7 +22,7 @@ $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 ); @@ -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,7 +71,7 @@ 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("", "") ); @@ -83,9 +83,9 @@ var_dump( array_key_exists(1, NULL) ); var_dump( array_key_exists(1, true) ); // first args as boolean var_dump( array_key_exists(false, true) ); -// second args as float +// second args as float var_dump( array_key_exists(false, 17.5) ); -// args more than expected +// 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) ) ) ; 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 e55ce93706..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 */ diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index 681f6413f9..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 */ diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt index b3df9783a6..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 */ diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt index 183f0605c4..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 */ 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 461a8719ea..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 */ diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index 4efca6cb2d..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,8 +18,8 @@ echo "*** Testing array_key_exists() : usage variations ***\n"; $unset = 10; unset($unset); -$array = array ('null' => null, - 'NULL' => NULL, +$array = array ('null' => null, + 'NULL' => NULL, 'empty single quoted string' => '', "empty double quoted string" => "", 'undefined variable' => @$undefined, 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 9dc1f0626c..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 */ @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index bda5700c3a..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 ), diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index 6fa5e4225d..e02e4095d8 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -10,7 +10,7 @@ $resource2 = opendir( "." ); /* creating an array with resource types as elements */ $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_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 e2176df760..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 */ diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index e0ab99b042..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 */ 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 205260b2a5..e6a8096282 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -26,7 +26,7 @@ $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( 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")) ); @@ -47,16 +47,16 @@ foreach($begin_array as $first) { 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()) ) ); 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 67a45e33c8..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,7 +82,7 @@ $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() diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 224b594a8a..8e28b7434c 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -8,7 +8,7 @@ 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. */ @@ -22,7 +22,7 @@ $arr1 = array( 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_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index dfbfc56337..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() diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt index 76e2ee399c..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() 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_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 76821fae0f..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 */ diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 00a197a29e..37596f4f00 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt index 7b67b4840d..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 */ diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt index 6eec1d98e5..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 */ diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index 05e520d67f..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 */ @@ -52,7 +52,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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 79248b0cbc..cb2b4a4c0c 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index af59731558..0e5e3df684 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index ce4be6bd9a..390640700c 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt index d1ea4663d2..7dcb5c12b5 100644 --- a/ext/standard/tests/array/array_multisort_error.phpt +++ b/ext/standard/tests/array/array_multisort_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index b03c2f2d33..a20a0f1151 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index 66f57d7257..56fb3df582 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index 21d6844864..79ff8e99c6 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index f84b73c773..f34c501eec 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt index e761a9649c..5e84548d7e 100644 --- a/ext/standard/tests/array/array_multisort_variation1.phpt +++ b/ext/standard/tests/array/array_multisort_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index e6c068e276..17bdeae5cd 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt index ab2bfcca3d..8c26a8347b 100644 --- a/ext/standard/tests/array/array_multisort_variation2.phpt +++ b/ext/standard/tests/array/array_multisort_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt index 49bae0ff34..28130e31fd 100644 --- a/ext/standard/tests/array/array_multisort_variation3.phpt +++ b/ext/standard/tests/array/array_multisort_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index 6ec0f5720c..562be2e70e 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index bb18e9893f..2953846825 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 70b03a4bd0..f5ffb8a7e4 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 7c6dd5f135..4ad68efe19 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 1765315337..6d89dd0c6c 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt index 7c76919d23..8d422b78c0 100644 --- a/ext/standard/tests/array/array_multisort_variation9.phpt +++ b/ext/standard/tests/array/array_multisort_variation9.phpt @@ -3,7 +3,7 @@ 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: */ 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 77a2d6e949..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 */ diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt index b761d615a7..e948fce989 100644 --- a/ext/standard/tests/array/array_pad_variation3.phpt +++ b/ext/standard/tests/array/array_pad_variation3.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_product_error.phpt b/ext/standard/tests/array/array_product_error.phpt index 4aaf2112b9..3ef23b9210 100644 --- a/ext/standard/tests/array/array_product_error.phpt +++ b/ext/standard/tests/array/array_product_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt index 799e7ea0ca..b8f2013dc3 100644 --- a/ext/standard/tests/array/array_product_variation1.phpt +++ b/ext/standard/tests/array/array_product_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index 0f81835c17..38faf712e1 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index 9202ef20c8..cd3f24afff 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index 51d0c12ca6..c79077c78f 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -3,7 +3,7 @@ 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: */ diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt index 36e9f5708a..09284d9096 100644 --- a/ext/standard/tests/array/array_product_variation5.phpt +++ b/ext/standard/tests/array/array_product_variation5.phpt @@ -1,9 +1,9 @@ --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: */ 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 766d8459d1..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 */ diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index 0cb14b5039..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 */ 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 3cf0d7f91c..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 */ @@ -51,7 +51,7 @@ $inputs = array( // null data /*3*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), 'null lowercase' => array( null => 'null 2', ), 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 b9e75c9679..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 */ 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 4e3e13462b..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 */ @@ -81,7 +81,7 @@ $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; diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt index 9978673e50..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 */ diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt index b858a13e7d..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(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2), - // array with single quoted strings + // 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 diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt index f2a665185a..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 */ @@ -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 diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt index 734c6267b9..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 */ @@ -24,7 +24,7 @@ $input = array( ); // 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"; 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_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt index 0cbb2c6428..88070dee55 100644 --- a/ext/standard/tests/array/array_reduce_error.phpt +++ b/ext/standard/tests/array/array_reduce_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index a2a396b556..618a22282a 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_reduce_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt index d1cb97e2c4..853ceb946b 100644 --- a/ext/standard/tests/array/array_reduce_variation2.phpt +++ b/ext/standard/tests/array/array_reduce_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index 274259129d..099af89a9f 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -1,9 +1,9 @@ --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: */ 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_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index a71ec8311d..88f36ea025 100644 --- a/ext/standard/tests/array/array_reverse_variation4.phpt +++ b/ext/standard/tests/array/array_reverse_variation4.phpt @@ -54,7 +54,7 @@ $arrays = array ( 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 5c889ee118..dbd316ab8a 100644 --- a/ext/standard/tests/array/array_reverse_variation5.phpt +++ b/ext/standard/tests/array/array_reverse_variation5.phpt @@ -53,11 +53,11 @@ $arrays = array ( // 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_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 2355008261..cbbf714b6f 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -28,7 +28,7 @@ var_dump( array_search((int)$dir_handle, $resources, true) ); 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 +//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 @@ -42,8 +42,8 @@ var_dump( array_search("this", array(0)) ); 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, +var_dump( array_search(FALSE, + array("a"=> TRUE, "b"=> TRUE, array("c"=> TRUE, "d"=>TRUE) ) ) @@ -51,7 +51,7 @@ var_dump( array_search(FALSE, //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), 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 14615a1f61..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 */ diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt index f1a2bc9bfc..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 */ diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index 303d295e12..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 */ @@ -48,7 +48,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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 54de5740dd..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 */ diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index 0af0959989..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 */ diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index 40deacabb7..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 */ diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt index 90a1ac4a35..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 */ 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 96c8462df6..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 */ @@ -53,7 +53,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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_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 c795c2acd1..30e2847004 100644 --- a/ext/standard/tests/array/array_sum_variation1.phpt +++ b/ext/standard/tests/array/array_sum_variation1.phpt @@ -3,7 +3,7 @@ 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 */ 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 25b565cd26..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 */ 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 eec33b0530..ae7c3b9586 100644 --- a/ext/standard/tests/array/array_udiff_assoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index c813e9383b..eca26a30e6 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index 44b78a75f1..2cbc9572d2 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index bdc0b01596..1a2c1ed978 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt index 324aacbca3..0f4da2c29d 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt index bcd748fe01..20a5afa202 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 680f65c6cf..10afe341a3 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -1,9 +1,9 @@ --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: */ 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 c3063d3046..7eb7e3b068 100644 --- a/ext/standard/tests/array/array_udiff_error.phpt +++ b/ext/standard/tests/array/array_udiff_error.phpt @@ -1,9 +1,9 @@ --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: */ 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 c157a53946..76dbf16dba 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_error.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index 8773f6c4ff..3bb26102b4 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index 2cc56ba057..2324c5a47b 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt index 7096451e8a..bf19c533cb 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt index 31d14a5120..7be89f4c6f 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt index 12a2f32ecf..820f0466ad 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index 39def47e24..4939b8eba5 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index 02db27173c..5eb84146a1 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index c58822feaa..61aa1f0c9a 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_variation3.phpt b/ext/standard/tests/array/array_udiff_variation3.phpt index 1f5532ee06..294686b22a 100644 --- a/ext/standard/tests/array/array_udiff_variation3.phpt +++ b/ext/standard/tests/array/array_udiff_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt index d46ca719bb..a92c5ddfdf 100644 --- a/ext/standard/tests/array/array_udiff_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index 76f8a29135..967817bac3 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -1,9 +1,9 @@ --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: */ 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_error.phpt b/ext/standard/tests/array/array_uintersect_assoc_error.phpt index fd491622f1..d27f9f7606 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_error.phpt @@ -1,5 +1,5 @@ --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) diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index c94d8f744f..a2babcdb02 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -1,5 +1,5 @@ --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) diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index 97b88c1b0f..8723157506 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -1,5 +1,5 @@ --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) diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt index aabd8a68df..29d2694ddb 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt @@ -1,5 +1,5 @@ --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) diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt index dca5b9d5f0..33883fa24d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt @@ -1,5 +1,5 @@ --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) diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index e7f5f6d725..34b10af344 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -1,9 +1,9 @@ --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: */ 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 230247e52d..3c7696108a 100644 --- a/ext/standard/tests/array/array_uintersect_error.phpt +++ b/ext/standard/tests/array/array_uintersect_error.phpt @@ -1,9 +1,9 @@ --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: */ 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 b10de85f88..bdf503c9ed 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index 1a6d501bce..84d4e634cf 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index 1279428982..8692026fc4 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt index 87991b532e..16ffec717f 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt index ed563ca499..ce7eb49a64 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt index 4f0c361287..d1db008416 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index e8f7974577..6abeac09b7 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index 0c5f406b1e..c88177018b 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index 6ce6ca0306..ee52e21c72 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_variation3.phpt b/ext/standard/tests/array/array_uintersect_variation3.phpt index 8cc9598e57..a4f670addb 100644 --- a/ext/standard/tests/array/array_uintersect_variation3.phpt +++ b/ext/standard/tests/array/array_uintersect_variation3.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt index 0c189fd765..abc33e591b 100644 --- a/ext/standard/tests/array/array_uintersect_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_variation4.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 9c41db3acd..699188290b 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -1,9 +1,9 @@ --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: */ 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 176017c86a..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 */ diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index 4d82e5f71d..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 */ diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt index 8a6392fb9c..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 */ 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 b2b2c5556c..d8a318dd93 100644 --- a/ext/standard/tests/array/array_unique_variation8.phpt +++ b/ext/standard/tests/array/array_unique_variation8.phpt @@ -3,12 +3,12 @@ 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. */ diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 9427a1cb24..9c3c1b6226 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -3,7 +3,7 @@ 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 */ diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index 4be6b8d1e5..eae951027a 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -3,7 +3,7 @@ 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 */ 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 c8073ecaa1..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() { 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 d3f901d1f0..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 */ diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt index 48f12e9dc8..0cc3064864 100644 --- a/ext/standard/tests/array/array_unshift_variation5.phpt +++ b/ext/standard/tests/array/array_unshift_variation5.phpt @@ -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 e41d4bdced..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 */ diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index 7a9f9720c1..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 */ diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index f4c57351ed..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 */ 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_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index 19b2fb73fa..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 */ diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt index b939354da5..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 */ diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 69359b409c..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 */ @@ -49,7 +49,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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_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 b1412f4b97..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,9 +14,9 @@ $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) @@ -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_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 e39320d1ec..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 */ diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt index fe51143a60..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 */ diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 1be79f7241..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 */ 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 40d5e1eb2b..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,9 +14,9 @@ $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) @@ -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 8b5e92a0e0..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 */ diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt index d68d1554dc..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"; diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index 42855b0a68..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 */ diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt index 105c1af4f1..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 */ 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 2db65ff20f..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 */ @@ -33,7 +33,7 @@ $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 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 c07a353d38..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 */ 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 46a58fa53b..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 */ diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt index e1698ab4d6..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 */ 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 34d7a8c2ec..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 */ @@ -33,7 +33,7 @@ $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 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 a411ae0b5c..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 */ 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 5f82ab65d8..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 */ 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 40db0b4817..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 */ diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt index 1e674ffd3a..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 */ diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index 947d8f07a9..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 */ diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index 093be7e61c..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 */ 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_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index ede832f26f..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 */ 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 b8149c66a6..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,13 +23,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { echo "*** Testing arsort() : usage variations ***\n"; $various_arrays = array ( - // group of escape sequences + // 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 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 1f948092a9..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() ) ); 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 414c89086c..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 */ diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt index dc5c4b9522..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 */ diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 6ad5b4a6ea..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 */ diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index 3762ce04a5..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 */ 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_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index 1b201a9c2b..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 */ 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 bb0581a660..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,13 +23,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { echo "*** Testing asort() : usage variations ***\n"; $various_arrays = array ( - // group of escape sequences + // 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 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 d53fb0d21c..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() ) ); 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/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt index abe73567ec..b2d133ef13 100644 --- a/ext/standard/tests/array/bug41121.phpt +++ b/ext/standard/tests/array/bug41121.phpt @@ -13,7 +13,7 @@ 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 ) ); diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt index 66bbc394d6..4c41607d34 100644 --- a/ext/standard/tests/array/bug41686.phpt +++ b/ext/standard/tests/array/bug41686.phpt @@ -6,11 +6,11 @@ $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) ); 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/compact_error.phpt b/ext/standard/tests/array/compact_error.phpt index 77a78009bd..9216ac9ba6 100644 --- a/ext/standard/tests/array/compact_error.phpt +++ b/ext/standard/tests/array/compact_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 273e27683c..f5cff97e0b 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test count() function : basic functionality +Test count() function : basic functionality --FILE-- <?php /* Prototype : int count(mixed $var [, int $mode]) 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/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_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 d061ec65b7..cd38682dc7 100644 --- a/ext/standard/tests/array/each_basic.phpt +++ b/ext/standard/tests/array/each_basic.phpt @@ -1,10 +1,10 @@ --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 */ 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 ddb196f77e..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 */ diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt index 879bc124d9..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 */ diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt index 63d4ded13a..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 */ @@ -49,7 +49,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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 adf9fcecdc..dc3f2eb75e 100644 --- a/ext/standard/tests/array/end.phpt +++ b/ext/standard/tests/array/end.phpt @@ -50,7 +50,7 @@ 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) ); diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index cbb5e0332a..6b9e07ff74 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -50,7 +50,7 @@ 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) ); 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 259c55b747..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 */ 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_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 72ce83e675..a0dcdf9673 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -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 17f2370947..a858c597b5 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -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 5066193810..d755a6a214 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -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 d9bee0f276..91867b1112 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -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/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 317d153625..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 */ diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index d32df1c748..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 */ diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt index 9ecd334b9b..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 */ diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index eeebee978d..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 */ @@ -31,7 +31,7 @@ var_dump( in_array((int)$dir_handle, $resources, true) ); 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 +//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 @@ -45,8 +45,8 @@ var_dump( in_array("this", array(0)) ); 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, +var_dump( in_array(FALSE, + array("a"=> TRUE, "b"=> TRUE, array("c"=> TRUE, "d"=>TRUE) ) ) @@ -54,7 +54,7 @@ var_dump( in_array(FALSE, //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), 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_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt index 148c4d8400..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 */ diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index c34a1154c7..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 */ @@ -48,7 +48,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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 ad7b3b9787..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 +// 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 b28d44c057..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"; diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt index a1ddd8de29..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 */ /* diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index 102e6fd1f7..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] ) diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index ee97794bd5..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 */ diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index cc3eabf1e7..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, 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_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index da5b047e24..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,7 +17,7 @@ Test krsort() function : usage variations - sort hexadecimal values echo "*** Testing krsort() : usage variations ***\n"; -// an array containing unsorted hexadecimal values with keys +// 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 b12f017eb8..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() ) ); 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 4678b5dda8..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"; diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 2e08991d79..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 */ diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 243e3b171f..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; diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index 57975d8c28..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 */ diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index e51ad0a85f..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,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, diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 48218b2eda..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,7 +16,7 @@ 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 ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB, diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index 6c7f3b870e..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() ) ); 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/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_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index 1f836df3c2..531f4ecfab 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -48,7 +48,7 @@ $inputs = array( // null data /*4*/ 'null uppercase' => array( NULL => 'null 1', - ), + ), /*5*/ 'null lowercase' => array( null => 'null 2', 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 e5ce177375..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 */ 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 1ac902b1f4..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 */ 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/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 ccdff248bf..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 */ 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 0d13a48dda..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,7 +13,7 @@ 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", 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 2c0b571136..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 */ diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt index f3eecb7fef..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 */ @@ -60,7 +60,7 @@ $unsorted_int_obj = array( // array of string objects $unsorted_str_obj = array ( - new for_string_rsort("axx","AXX","ass"), + 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 87e8977487..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 */ 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 b6e423111c..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 */ diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index ee740fd2a6..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 */ 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 a8555ed0d9..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 */ 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 49b600699e..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 */ 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 b43572d05a..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 ); diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt index 6e456459d6..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 */ diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt index 72c6487af5..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 */ diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt index 0479a8f817..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 */ @@ -68,7 +68,7 @@ var_dump( shuffle($heredoc_array) ); echo "\nThe output array is:\n"; 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) ); echo "\nThe output array is:\n"; diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt index e7fa988373..c292199cb9 100644 --- a/ext/standard/tests/array/sizeof_basic1.phpt +++ b/ext/standard/tests/array/sizeof_basic1.phpt @@ -1,15 +1,15 @@ --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. */ diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index 6b96863ab4..a76e54d70a 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -3,13 +3,13 @@ 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. 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 1976c78c1d..c81018f635 100644 --- a/ext/standard/tests/array/sizeof_object2.phpt +++ b/ext/standard/tests/array/sizeof_object2.phpt @@ -19,7 +19,7 @@ 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() { diff --git a/ext/standard/tests/array/sizeof_variation1.phpt b/ext/standard/tests/array/sizeof_variation1.phpt index 4f394c2fdc..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, @@ -32,22 +32,22 @@ $values = array ( /* 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 ); diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index 1fd024ec2e..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)))), @@ -34,7 +34,7 @@ $values = array ( /* 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++) 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 983be5bb56..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]) @@ -19,7 +19,7 @@ class test public $member1; } -// get an resource variable +// get an resource variable $fp = fopen(__FILE__, "r"); // array containing different types of variables @@ -54,14 +54,14 @@ $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 diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt index 89fce6631c..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]) @@ -53,7 +53,7 @@ $mode_values = array ( /* 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++) diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index fe5796c37f..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,7 +19,7 @@ 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", diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt index 5337388b17..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"; diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt index 7c0be40607..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 */ diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt index 026c45b852..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 */ @@ -59,7 +59,7 @@ $unsorted_int_obj = array( // array of string objects $unsorted_str_obj = array ( - new for_string_sort("axx","AXX","ass"), + 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 5bcb95d860..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,7 +73,7 @@ $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"; 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 0fb5612333..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 */ diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt index 4515390b20..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 */ 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 9e8cda117e..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 */ 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 5c981fe038..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 */ diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt index 37ba620a5d..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 */ diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt index 1e5d9ad6e1..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 */ diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index ab54a11094..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 */ 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 4b353dfccf..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; 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 366a640c02..db9fdea088 100644 --- a/ext/standard/tests/array/uksort_error.phpt +++ b/ext/standard/tests/array/uksort_error.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt index 079cbd6d77..21210dee7b 100644 --- a/ext/standard/tests/array/uksort_variation1.phpt +++ b/ext/standard/tests/array/uksort_variation1.phpt @@ -1,9 +1,9 @@ --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: */ diff --git a/ext/standard/tests/array/uksort_variation2.phpt b/ext/standard/tests/array/uksort_variation2.phpt index 610fa73d06..5ac32f02b8 100644 --- a/ext/standard/tests/array/uksort_variation2.phpt +++ b/ext/standard/tests/array/uksort_variation2.phpt @@ -1,9 +1,9 @@ --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: */ 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 b66a957bc2..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 */ diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index cc88e334d6..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 */ 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 bd7666744d..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 */ @@ -48,7 +48,7 @@ $array_arg = array( // string keys 'key' => 5, //single quoted key - "two" => 4, //double quoted key + "two" => 4, //double quoted key " " => 0, // space as key // bool keys diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index b358be46d9..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 */ diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt index cb9efcdccc..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; 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 2820d50d2b..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 */ @@ -19,7 +19,7 @@ echo "*** Testing usort() : usage variation ***\n"; $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 9060480209..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 */ diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt index 3f8a0003c7..08e1188d60 100644 --- a/ext/standard/tests/assert/assert.phpt +++ b/ext/standard/tests/assert/assert.phpt @@ -4,7 +4,7 @@ assert() error_reporting = 2039 assert.active = 0 assert.warning = 1 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 0 --FILE-- diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt index 50c69e8ffd..80c42df473 100644 --- a/ext/standard/tests/assert/assert03.phpt +++ b/ext/standard/tests/assert/assert03.phpt @@ -3,7 +3,7 @@ assert() - set callback using ini_set() --INI-- assert.active = 1 assert.warning = 0 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 1 --FILE-- diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt index c8f58d310e..7303dbb23f 100644 --- a/ext/standard/tests/assert/assert04.phpt +++ b/ext/standard/tests/assert/assert04.phpt @@ -3,7 +3,7 @@ misc assert() tests tests --INI-- assert.active = 1 assert.warning = 1 -assert.callback = +assert.callback = assert.bail = 0 assert.quiet_eval = 0 --FILE-- diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt index 7d92ee31bc..73b3e73206 100644 --- a/ext/standard/tests/assert/assert_basic.phpt +++ b/ext/standard/tests/assert/assert_basic.phpt @@ -18,7 +18,7 @@ var_dump($r2=assert($sa)); $sa = "0 == 0"; var_dump($r2=assert($sa)); -//Non string assert +//Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); --EXPECTF-- diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index 4ba67dc9dd..a5bcda3316 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -19,7 +19,7 @@ var_dump($r2=assert($sa)); $sa = "0 == 0"; var_dump($r2=assert($sa)); -//Non string assert +//Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); --EXPECT-- diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index 6c2baab437..e44c9a4c6d 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -8,7 +8,7 @@ assert.quiet_eval = 0 assert.callback = f1 --FILE-- <?php -// Check the initial settings for all assert_options +// Check the initial settings for all assert_options //Using assert_options; echo "Initial values: assert_options(ASSERT_ACTIVE) => [".assert_options(ASSERT_ACTIVE)."]\n"; diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt index 8c63d43192..1ea52b0b9e 100644 --- a/ext/standard/tests/assert/assert_variation.phpt +++ b/ext/standard/tests/assert/assert_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -assert() - variation - test callback options using ini_get/ini_set/assert_options +assert() - variation - test callback options using ini_get/ini_set/assert_options --INI-- assert.active = 1 assert.warning = 0 diff --git a/ext/standard/tests/bug64370_var1.phpt b/ext/standard/tests/bug64370_var1.phpt index aca46a594d..87172c9b60 100644 --- a/ext/standard/tests/bug64370_var1.phpt +++ b/ext/standard/tests/bug64370_var1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'] +Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'] --FILE-- <?php echo "\$_SERVER['REQUEST_TIME']: {$_SERVER['REQUEST_TIME']}\n"; diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index b092f496c2..b95efecd65 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test class_exists() function : basic functionality +Test class_exists() function : basic functionality --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/class_exists_error_001.phpt b/ext/standard/tests/class_object/class_exists_error_001.phpt index 4386a76202..0c9a121470 100644 --- a/ext/standard/tests/class_object/class_exists_error_001.phpt +++ b/ext/standard/tests/class_object/class_exists_error_001.phpt @@ -3,7 +3,7 @@ Test class_exists() function : error conditions (wrong number of arguments) --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index 1d9cadd125..561a77fa2c 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -3,7 +3,7 @@ Test class_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt index 1be10387d4..4b77d032ea 100644 --- a/ext/standard/tests/class_object/class_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt @@ -3,7 +3,7 @@ Test class_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index ea2b3a354a..af6d50bef2 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -3,7 +3,7 @@ Test class_exists() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool class_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt index d808c8441d..34814aecd4 100644 --- a/ext/standard/tests/class_object/get_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_error_001.phpt @@ -3,7 +3,7 @@ Test get_class() function : error conditions - wrong number of arguments. --FILE-- <?php /* Prototype : proto string get_class([object object]) - * Description: Retrieves the class name + * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index e214e0f4e5..b874295036 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_class_methods() function : basic functionality +Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index faed0d4c7f..e5e94e1c28 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -3,7 +3,7 @@ Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index b86a0afc03..a77f61819a 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_class_methods() function : basic functionality +Test get_class_methods() function : basic functionality --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt index b053d6cc69..9888c26ae0 100644 --- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_class_methods() function : error conditions +Test get_class_methods() function : error conditions --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt index 37f9bf3ba5..abc2395209 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt @@ -3,7 +3,7 @@ Test get_class_methods() function : usage variations - unexpected types --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 204398141f..e6e4305691 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -3,7 +3,7 @@ Test get_class_methods() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto array get_class_methods(mixed class) - * Description: Returns an array of method names for class or class instance. + * Description: Returns an array of method names for class or class instance. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 9770eeb099..ad7b656382 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -3,7 +3,7 @@ Test get_class() function : usage variations - ensure class name case is preser --FILE-- <?php /* Prototype : proto string get_class([object object]) - * Description: Retrieves the class name + * Description: Retrieves the class name * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_vars_variation1.phpt b/ext/standard/tests/class_object/get_class_vars_variation1.phpt index 4aaeb78d61..5ade3f240f 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation1.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_class_vars() function : usage variation +Test get_class_vars() function : usage variation --FILE-- <?php /* Prototype : array get_class_vars(string class_name) - * Description: Returns an array of default properties of the class. + * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index fdf5b48545..0e54864b09 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_class_vars() function : testing visibility +Test get_class_vars() function : testing visibility --FILE-- <?php /* Prototype : array get_class_vars(string class_name) - * Description: Returns an array of default properties of the class. + * Description: Returns an array of default properties of the class. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt index 4b89f2971b..bede42a762 100644 --- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_classes() function : basic functionality +Test get_declared_classes() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt index 4262d34490..7132410fb8 100644 --- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_classes() function : error conditions +Test get_declared_classes() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt index 4e9517b660..669378740a 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_classes() function : testing autoloaded classes +Test get_declared_classes() function : testing autoloaded classes --FILE-- <?php /* Prototype : proto array get_declared_classes() - * Description: Returns an array of all declared classes. + * Description: Returns an array of all declared classes. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt index 1d3f503da1..0fd665b250 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_interfaces() function : basic functionality +Test get_declared_interfaces() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt index 6de6a42be2..1b11981492 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_interfaces() function : error conditions +Test get_declared_interfaces() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt index fa2204b02a..a6978c6d30 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -3,7 +3,7 @@ Test get_declared_interfaces() function : autoloading of interfaces --FILE-- <?php /* Prototype : proto array get_declared_interfaces() - * Description: Returns an array of all declared interfaces. + * Description: Returns an array of all declared interfaces. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt index 989bb094f0..27962d6c56 100644 --- a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_traits() function : basic functionality +Test get_declared_traits() function : basic functionality --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt index 3a5624aa25..522ad36a1b 100644 --- a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_declared_traits() function : error conditions +Test get_declared_traits() function : error conditions --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt index e9291e6295..9faef55241 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -3,7 +3,7 @@ Test get_declared_traits() function : testing autoloaded traits --FILE-- <?php /* Prototype : proto array get_declared_traits() - * Description: Returns an array of all declared traits. + * Description: Returns an array of all declared traits. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index aff6357031..51a68db2ef 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -3,7 +3,7 @@ get_object_vars(): visibility from static methods (target object passed as arg) --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index 176b149e75..9d9b67cb67 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -3,7 +3,7 @@ get_object_vars(): visibility from non static methods (target object passed as a --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt index 48c89ba8fa..c25ded8bb2 100644 --- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt @@ -3,7 +3,7 @@ Test get_object_vars() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index 2fe1d60f6f..edf6815083 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -3,7 +3,7 @@ get_object_vars() - ensure statics are not shown --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index 7c3ad7b0e1..8c7cabdc6f 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -3,7 +3,7 @@ get_object_vars() - ensure references are preserved --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index e42d359038..5ad775ace3 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -3,7 +3,7 @@ Test get_object_vars() function : usage variations - unexpected types for argum --FILE-- <?php /* Prototype : proto array get_object_vars(object obj) - * Description: Returns an array of object properties + * Description: Returns an array of object properties * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt index 68fe170390..ed0644dce7 100644 --- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt @@ -3,7 +3,7 @@ Test get_parent_class() function : error conditions - wrong number of args. --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index 52020edc19..5102220136 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -3,7 +3,7 @@ Test get_parent_class() function : variation - case sensitivity --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt index a64398b2eb..8dde525ae8 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt @@ -3,7 +3,7 @@ Test get_parent_class() function : usage variations - unexpected argument type. --FILE-- <?php /* Prototype : proto string get_parent_class([mixed object]) - * Description: Retrieves the parent class name for object or class or current scope. + * Description: Retrieves the parent class name for object or class or current scope. * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/interface_exists_error.phpt b/ext/standard/tests/class_object/interface_exists_error.phpt index f57405d5dc..312665267f 100644 --- a/ext/standard/tests/class_object/interface_exists_error.phpt +++ b/ext/standard/tests/class_object/interface_exists_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test interface_exists() function : error conditions +Test interface_exists() function : error conditions --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/interface_exists_variation1.phpt b/ext/standard/tests/class_object/interface_exists_variation1.phpt index 4bdde8ba97..f265d0085c 100644 --- a/ext/standard/tests/class_object/interface_exists_variation1.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test interface_exists() function : usage variation +Test interface_exists() function : usage variation --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt index ecd90e9199..1f9a0af422 100644 --- a/ext/standard/tests/class_object/interface_exists_variation2.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test interface_exists() function : usage variation +Test interface_exists() function : usage variation --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt index 86d10de887..ce66ca1b41 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test interface_exists() function : autoloaded interface +Test interface_exists() function : autoloaded interface --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt index 95059f8247..17ba97d85a 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test interface_exists() function : test autoload default value +Test interface_exists() function : test autoload default value --FILE-- <?php /* Prototype : bool interface_exists(string classname [, bool autoload]) - * Description: Checks if the class exists + * Description: Checks if the class exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index d41d37b44b..1f72678637 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -3,7 +3,7 @@ Test is_a() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name, bool allow_string) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index 9bd1023c52..563195cd0c 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -3,11 +3,11 @@ Test is_a() function : usage variations - wrong type for arg 1 --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ -// Note: basic use cases in Zend/tests/is_a.phpt +// Note: basic use cases in Zend/tests/is_a.phpt echo "*** Testing is_a() : usage variations ***\n"; // Initialise function arguments not being substituted (if any) diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt index 5ba2c80bcc..615a45ba33 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -3,7 +3,7 @@ Test is_a() function : usage variations - wrong type for arg 2 --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index 1ee193a7c8..0813f28308 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -3,7 +3,7 @@ Test is_a() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) - * Description: Returns true if the object is of this class or has this class as one of its parents + * Description: Returns true if the object is of this class or has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt index 3224e56e9e..cd5b3b44a6 100644 --- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test is_subclass_of() function : wrong number of args +Test is_subclass_of() function : wrong number of args --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt index d2f8f0745b..d65bfcbc26 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt @@ -3,7 +3,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt index 150ea3da9c..a7ebab59c5 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt @@ -3,7 +3,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 2 --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index e77de23a1e..909e2bc09a 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -3,7 +3,7 @@ Test is_subclass_of() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt index 4d2bef3cb3..0a4c575258 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt @@ -3,7 +3,7 @@ Test is_subclass_of() function : usage variations - unexpected type for arg 1 w --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 282ca4a4f6..2898dc7fda 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -3,7 +3,7 @@ method_exists() on userspace classes; static & non-static methods with various v --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index fc64ee49a9..f9c8e7e2c4 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -3,7 +3,7 @@ method_exists() on internal classes --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index 7714341c87..e92b7a9135 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -3,7 +3,7 @@ method_exists() on non-existent class, with __autoload(). --FILE-- <?php /* Prototype : proto bool is_subclass_of(object object, string class_name) - * Description: Returns true if the object has this class as one of its parents + * Description: Returns true if the object has this class as one of its parents * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt index 1f645d6717..de1edfe04a 100644 --- a/ext/standard/tests/class_object/method_exists_error_001.phpt +++ b/ext/standard/tests/class_object/method_exists_error_001.phpt @@ -3,7 +3,7 @@ Test method_exists() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt index aa7e1be429..4accebe20a 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -3,7 +3,7 @@ Test method_exists() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt index e78181375c..ad97d49df7 100644 --- a/ext/standard/tests/class_object/method_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt @@ -3,7 +3,7 @@ Test method_exists() function : usage variations - unexpected type for arg 2 --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index cb0e0026d6..5876cfa9bd 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -3,7 +3,7 @@ Test method_exists() function : variation - Case sensitivity --FILE-- <?php /* Prototype : proto bool method_exists(object object, string method) - * Description: Checks if the class method exists + * Description: Checks if the class method exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/property_exists_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt index 4d51a64507..e4564cbfa8 100644 --- a/ext/standard/tests/class_object/property_exists_error.phpt +++ b/ext/standard/tests/class_object/property_exists_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test property_exists() function : error conditions +Test property_exists() function : error conditions --FILE-- <?php /* Prototype : bool property_exists(mixed object_or_class, string property_name) - * Description: Checks if the object or class has a property + * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 7a88449222..4b0ce2baff 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test property_exists() function : class auto loading +Test property_exists() function : class auto loading --FILE-- <?php /* Prototype : bool property_exists(mixed object_or_class, string property_name) - * Description: Checks if the object or class has a property + * Description: Checks if the object or class has a property * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt index c865705b14..60880236d8 100644 --- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt @@ -3,7 +3,7 @@ Test trait_exists() function : usage variations - case sensitivity --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt index d47ba7ad46..708c6c91e4 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test trait_exists() function : basic functionality +Test trait_exists() function : basic functionality --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/trait_exists_error_001.phpt b/ext/standard/tests/class_object/trait_exists_error_001.phpt index a60788b53d..70d18513db 100644 --- a/ext/standard/tests/class_object/trait_exists_error_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_error_001.phpt @@ -3,7 +3,7 @@ Test trait_exists() function : error conditions (wrong number of arguments) --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt index 39a843a167..b51126c1ed 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt @@ -3,7 +3,7 @@ Test trait_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt index bdf1e2cb82..a4a4a209ec 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt @@ -3,7 +3,7 @@ Test trait_exists() function : usage variations - unexpected types for argument --FILE-- <?php /* Prototype : proto bool trait_exists(string traitname [, bool autoload]) - * Description: Checks if the trait exists + * Description: Checks if the trait exists * Source code: Zend/zend_builtin_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt index 8d5b2ff986..3cd5d71761 100644 --- a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chdir() function : basic functionality +Test chdir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt index 81d3c7c9d1..4e18988076 100644 --- a/ext/standard/tests/dir/chdir_basic.phpt +++ b/ext/standard/tests/dir/chdir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test chdir() function : basic functionality +Test chdir() function : basic functionality --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error1.phpt b/ext/standard/tests/dir/chdir_error1.phpt index 0f57ff5b2a..794bd5c757 100644 --- a/ext/standard/tests/dir/chdir_error1.phpt +++ b/ext/standard/tests/dir/chdir_error1.phpt @@ -3,7 +3,7 @@ Test chdir() function : error conditions - Incorrect number of arguments --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt index 2b23c90644..4f6272ce4f 100644 --- a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_error2.phpt b/ext/standard/tests/dir/chdir_error2.phpt index a3bbb63e6d..6c322a2e3a 100644 --- a/ext/standard/tests/dir/chdir_error2.phpt +++ b/ext/standard/tests/dir/chdir_error2.phpt @@ -3,7 +3,7 @@ Test chdir() function : error conditions - Non-existent directory --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt index 0383410cb7..5b9fa16486 100644 --- a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt index bad543fa6e..f456f1e1a7 100644 --- a/ext/standard/tests/dir/chdir_variation1.phpt +++ b/ext/standard/tests/dir/chdir_variation1.phpt @@ -3,7 +3,7 @@ Test chdir() function : usage variations - different data type as $directory arg --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt index f28d57ab4f..0d67b0fbc3 100644 --- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt index 9ca6a97748..097ab56e00 100644 --- a/ext/standard/tests/dir/chdir_variation2.phpt +++ b/ext/standard/tests/dir/chdir_variation2.phpt @@ -3,7 +3,7 @@ Test chdir() function : usage variations - relative paths --FILE-- <?php /* Prototype : bool chdir(string $directory) - * Description: Change the current directory + * Description: Change the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt index 2602e292ff..8515756b17 100644 --- a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test closedir() function : basic functionality +Test closedir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_basic.phpt b/ext/standard/tests/dir/closedir_basic.phpt index 49080bb6a2..2ef1aa7814 100644 --- a/ext/standard/tests/dir/closedir_basic.phpt +++ b/ext/standard/tests/dir/closedir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test closedir() function : basic functionality +Test closedir() function : basic functionality --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_error-win32-mb.phpt b/ext/standard/tests/dir/closedir_error-win32-mb.phpt index 04c614e33d..e5ca80b7d2 100644 --- a/ext/standard/tests/dir/closedir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_error.phpt b/ext/standard/tests/dir/closedir_error.phpt index c2f7647ff9..b7ec7e3a79 100644 --- a/ext/standard/tests/dir/closedir_error.phpt +++ b/ext/standard/tests/dir/closedir_error.phpt @@ -3,7 +3,7 @@ Test closedir() function : error conditions - Pass incorrect number of arguments --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt index 9e46f114fd..b80837194b 100644 --- a/ext/standard/tests/dir/closedir_variation1.phpt +++ b/ext/standard/tests/dir/closedir_variation1.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - different data types as $dir_handl --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt index 26b4a5b8b7..f46a99b872 100644 --- a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt index 2437868d62..303d47c84e 100644 --- a/ext/standard/tests/dir/closedir_variation2.phpt +++ b/ext/standard/tests/dir/closedir_variation2.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - close directory handle twice --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/closedir_variation3.phpt b/ext/standard/tests/dir/closedir_variation3.phpt index b9b5e67e7a..7d7fdcbf0e 100644 --- a/ext/standard/tests/dir/closedir_variation3.phpt +++ b/ext/standard/tests/dir/closedir_variation3.phpt @@ -3,7 +3,7 @@ Test closedir() function : usage variations - close a file pointer --FILE-- <?php /* Prototype : void closedir([resource $dir_handle]) - * Description: Close directory connection identified by the dir_handle + * Description: Close directory connection identified by the dir_handle * Source code: ext/standard/dir.c * Alias to functions: close */ diff --git a/ext/standard/tests/dir/dir_error.phpt b/ext/standard/tests/dir/dir_error.phpt index 6f14188e8b..5bdf181b50 100644 --- a/ext/standard/tests/dir/dir_error.phpt +++ b/ext/standard/tests/dir/dir_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dir() function : error conditions +Test dir() function : error conditions --FILE-- <?php /* diff --git a/ext/standard/tests/dir/dir_variation3.phpt b/ext/standard/tests/dir/dir_variation3.phpt index b6cc96ddbb..91dc504713 100644 --- a/ext/standard/tests/dir/dir_variation3.phpt +++ b/ext/standard/tests/dir/dir_variation3.phpt @@ -57,7 +57,7 @@ $permission_values = array( for($count = 0; $count < count($permission_values); $count++) { echo "\n-- Iteration ".($count + 1)." --\n"; - // try to remove the dir if exists & create + // try to remove the dir if exists & create $file_path = dirname(__FILE__); $dir_path = $file_path."/dir_variation3"; @chmod ($dir_path, 0777); // change dir permission to allow all operation @@ -71,7 +71,7 @@ for($count = 0; $count < count($permission_values); $count++) { // try to get dir handle $d = dir($dir_path); - var_dump($d); // dump the handle + var_dump($d); // dump the handle // try read directory, expected : false echo "-- reading contents --\n"; diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index e26b925311..ea040bed8a 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -15,7 +15,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* - * Passing a file as argument to dir() function instead of a directory + * Passing a file as argument to dir() function instead of a directory * and checking if proper warning message is generated. */ diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index 9d24e4ac1a..4e7bd13f2f 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -15,7 +15,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* - * Create more than one temporary directory & subdirectory and check if dir() function can open + * Create more than one temporary directory & subdirectory and check if dir() function can open * those directories when wildcard characters are used to refer to them. */ diff --git a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt index 7ebbaa470f..f3d2a6d1d4 100644 --- a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt @@ -9,8 +9,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory - * Source code: ext/standard/dir.c + * Description: Gets the current directory + * Source code: ext/standard/dir.c */ /* diff --git a/ext/standard/tests/dir/getcwd_basic.phpt b/ext/standard/tests/dir/getcwd_basic.phpt index ef720d0959..f09eb7165a 100644 --- a/ext/standard/tests/dir/getcwd_basic.phpt +++ b/ext/standard/tests/dir/getcwd_basic.phpt @@ -3,8 +3,8 @@ Test getcwd() function : basic functionality --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory - * Source code: ext/standard/dir.c + * Description: Gets the current directory + * Source code: ext/standard/dir.c */ /* diff --git a/ext/standard/tests/dir/getcwd_error.phpt b/ext/standard/tests/dir/getcwd_error.phpt index 153f303677..1fcfa47a9d 100644 --- a/ext/standard/tests/dir/getcwd_error.phpt +++ b/ext/standard/tests/dir/getcwd_error.phpt @@ -3,7 +3,7 @@ Test getcwd() function : error conditions - Incorrect number of arguments --FILE-- <?php /* Prototype : mixed getcwd(void) - * Description: Gets the current directory + * Description: Gets the current directory * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt index f9d06bfdb7..ab332d05e2 100644 --- a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test opendir() function : basic functionality +Test opendir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_basic.phpt b/ext/standard/tests/dir/opendir_basic.phpt index 17ada17ea6..373d25c470 100644 --- a/ext/standard/tests/dir/opendir_basic.phpt +++ b/ext/standard/tests/dir/opendir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test opendir() function : basic functionality +Test opendir() function : basic functionality --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt index e363de4806..59ab389e10 100644 --- a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error1.phpt b/ext/standard/tests/dir/opendir_error1.phpt index 92b8eee1bd..ccfed4bf05 100644 --- a/ext/standard/tests/dir/opendir_error1.phpt +++ b/ext/standard/tests/dir/opendir_error1.phpt @@ -3,7 +3,7 @@ Test opendir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 1c724097b0..9156585938 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt index d3aeec213f..e5b891f5fa 100644 --- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt index ea75955035..a6811eb5ef 100644 --- a/ext/standard/tests/dir/opendir_variation2.phpt +++ b/ext/standard/tests/dir/opendir_variation2.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - different data types as $context ar --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt index 74d0a6b982..6ffd12aaff 100644 --- a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation3.phpt b/ext/standard/tests/dir/opendir_variation3.phpt index 3de0dd3701..1e9a62f394 100644 --- a/ext/standard/tests/dir/opendir_variation3.phpt +++ b/ext/standard/tests/dir/opendir_variation3.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - open a directory twice --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt index 901b13c4a8..d77b1156c3 100644 --- a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation4.phpt b/ext/standard/tests/dir/opendir_variation4.phpt index b20641740b..3a42c8d9c1 100644 --- a/ext/standard/tests/dir/opendir_variation4.phpt +++ b/ext/standard/tests/dir/opendir_variation4.phpt @@ -3,7 +3,7 @@ Test opendir() function : usage variations - different relative paths --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index f9bb38c68e..b5fc83caba 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index df9fcbb75b..caca6a0504 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index 4494772dcc..e16235ba87 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt index c16da417e2..a75859b9fc 100644 --- a/ext/standard/tests/dir/opendir_variation7.phpt +++ b/ext/standard/tests/dir/opendir_variation7.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle + * Description: Open a directory and return a dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt index 90cb81a27d..f9a7db632d 100644 --- a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readdir() function : basic functionality +Test readdir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.C */ diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt index 572a9a0799..c6d1d79d79 100644 --- a/ext/standard/tests/dir/readdir_basic.phpt +++ b/ext/standard/tests/dir/readdir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test readdir() function : basic functionality +Test readdir() function : basic functionality --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.C */ diff --git a/ext/standard/tests/dir/readdir_error-win32-mb.phpt b/ext/standard/tests/dir/readdir_error-win32-mb.phpt index 9938c71f22..21eaad4b06 100644 --- a/ext/standard/tests/dir/readdir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt index 88cfb7a9fa..24fbad37a9 100644 --- a/ext/standard/tests/dir/readdir_error.phpt +++ b/ext/standard/tests/dir/readdir_error.phpt @@ -3,7 +3,7 @@ Test readdir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt index 25efaf10bd..47e00c4b76 100644 --- a/ext/standard/tests/dir/readdir_variation1.phpt +++ b/ext/standard/tests/dir/readdir_variation1.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - different data types as $dir_handle --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt index 513a22b0cc..31e52c1105 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt index ac6d37aa15..38965872b0 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - empty directories --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index 5be20d93c2..1b3114c550 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readdir() function : usage variations - sub-directories +Test readdir() function : usage variations - sub-directories --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index eb6c31d6ce..1a7566c547 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test readdir() function : usage variations - sub-directories +Test readdir() function : usage variations - sub-directories --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt index 61116ab9c2..1c766a51d5 100644 --- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt @@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ /* - * Pass a directory handle pointing to a directory that contains + * Pass a directory handle pointing to a directory that contains * files with different file names to test how readdir() reads them */ diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt index d831394e8a..acbb8f32ab 100644 --- a/ext/standard/tests/dir/readdir_variation4.phpt +++ b/ext/standard/tests/dir/readdir_variation4.phpt @@ -3,12 +3,12 @@ Test readdir() function : usage variations - different file names --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ /* - * Pass a directory handle pointing to a directory that contains + * Pass a directory handle pointing to a directory that contains * files with different file names to test how readdir() reads them */ diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt index 81b54139a8..0ed40964a6 100644 --- a/ext/standard/tests/dir/readdir_variation5.phpt +++ b/ext/standard/tests/dir/readdir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index f439920ada..fc7d0f78c5 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt index 0da7fbd8be..889d96a387 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - operate on previously opened direct --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/readdir_variation7.phpt b/ext/standard/tests/dir/readdir_variation7.phpt index bff87ced0d..2cd23b8bfc 100644 --- a/ext/standard/tests/dir/readdir_variation7.phpt +++ b/ext/standard/tests/dir/readdir_variation7.phpt @@ -3,7 +3,7 @@ Test readdir() function : usage variations - use file pointers --FILE-- <?php /* Prototype : string readdir([resource $dir_handle]) - * Description: Read directory entry from dir_handle + * Description: Read directory entry from dir_handle * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt index bec721d3c5..aaf01aab09 100644 --- a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rewinddir() function : basic functionality +Test rewinddir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt index 2d1f783f57..3571808f85 100644 --- a/ext/standard/tests/dir/rewinddir_basic.phpt +++ b/ext/standard/tests/dir/rewinddir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test rewinddir() function : basic functionality +Test rewinddir() function : basic functionality --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt index bc107704a0..9fa264ba4c 100644 --- a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_error.phpt b/ext/standard/tests/dir/rewinddir_error.phpt index b3bb02bca3..2019c4a457 100644 --- a/ext/standard/tests/dir/rewinddir_error.phpt +++ b/ext/standard/tests/dir/rewinddir_error.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : error conditions - incorrect number of args --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt index 833da1c5c5..3007e43adb 100644 --- a/ext/standard/tests/dir/rewinddir_variation1.phpt +++ b/ext/standard/tests/dir/rewinddir_variation1.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - different data types as $dir_hand --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt index a3f5e8ecc9..b8f36d7eb2 100644 --- a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt index 6b06a56d95..aa18641292 100644 --- a/ext/standard/tests/dir/rewinddir_variation2.phpt +++ b/ext/standard/tests/dir/rewinddir_variation2.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - operate on a closed directory --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/rewinddir_variation3.phpt b/ext/standard/tests/dir/rewinddir_variation3.phpt index 2a2af89e63..a1ec7f80d4 100644 --- a/ext/standard/tests/dir/rewinddir_variation3.phpt +++ b/ext/standard/tests/dir/rewinddir_variation3.phpt @@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - file pointers --FILE-- <?php /* Prototype : void rewinddir([resource $dir_handle]) - * Description: Rewind dir_handle back to the start + * Description: Rewind dir_handle back to the start * Source code: ext/standard/dir.c * Alias to functions: rewind */ diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index f1cc3e11c8..14e9405303 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test scandir() function : basic functionality +Test scandir() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt index 668f659851..568ae5a5e2 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test scandir() function : basic functionality +Test scandir() function : basic functionality --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt index 6c1ce72a44..dcb15d46a0 100644 --- a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_error1.phpt b/ext/standard/tests/dir/scandir_error1.phpt index 7fbffba0cc..f603b696c9 100644 --- a/ext/standard/tests/dir/scandir_error1.phpt +++ b/ext/standard/tests/dir/scandir_error1.phpt @@ -3,7 +3,7 @@ Test scandir() function : error conditions - Incorrect number of args --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index b5bfc28c8e..2044471c66 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt index dfdd0509cd..6b664a2d2e 100644 --- a/ext/standard/tests/dir/scandir_variation1.phpt +++ b/ext/standard/tests/dir/scandir_variation1.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index e30994261f..b525e3caed 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt index 958079dcb9..0fade971b4 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different sorting constants --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt index 439d53a4df..2039ef33e4 100644 --- a/ext/standard/tests/dir/scandir_variation2-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt @@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt index 95200649ed..5bb26f0483 100644 --- a/ext/standard/tests/dir/scandir_variation2.phpt +++ b/ext/standard/tests/dir/scandir_variation2.phpt @@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt index 3a5391011d..ffb0284d95 100644 --- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt index 9630373b76..567bde0af7 100644 --- a/ext/standard/tests/dir/scandir_variation3.phpt +++ b/ext/standard/tests/dir/scandir_variation3.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - diff data types as $context arg --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt index 73064d779f..f415f13ad2 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt index 09dedfffd2..ffffcd5069 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different relative paths --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index 0835af0713..a17e8a5d35 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index 0a528466a4..c4467d1536 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index 63fbdbf423..6c77f69e4d 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -18,7 +18,7 @@ unlink($filename); --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt index ab6cb11036..9fead1e455 100644 --- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt index 73aa60f11f..9311d030c1 100644 --- a/ext/standard/tests/dir/scandir_variation8.phpt +++ b/ext/standard/tests/dir/scandir_variation8.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different file names --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index 031b4389af..022c1e5ba8 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt index 0435a8c3f3..8cabeb5e36 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -3,7 +3,7 @@ Test scandir() function : usage variations - different ints as $sorting_order ar --FILE-- <?php /* Prototype : array scandir(string $dir [, int $sorting_order [, resource $context]]) - * Description: List files & directories inside the specified path + * Description: List files & directories inside the specified path * Source code: ext/standard/dir.c */ diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt index d8bf6c5ee9..6ac22914db 100644 --- a/ext/standard/tests/file/005_error.phpt +++ b/ext/standard/tests/file/005_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fileatime(), filemtime(), filectime() & touch() functions : error conditions +Test fileatime(), filemtime(), filectime() & touch() functions : error conditions --FILE-- <?php /* diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt index 30c627abf1..68fa209b24 100644 --- a/ext/standard/tests/file/005_variation-win32.phpt +++ b/ext/standard/tests/file/005_variation-win32.phpt @@ -10,12 +10,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -45,7 +45,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt index 510560772e..f2bf19f6a3 100644 --- a/ext/standard/tests/file/005_variation.phpt +++ b/ext/standard/tests/file/005_variation.phpt @@ -13,12 +13,12 @@ if (getenv("SKIP_SLOW_TESTS")) { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE @@ -48,7 +48,7 @@ function stat_fn( $filename ) { echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n"; $file_path = dirname(__FILE__); -// create files +// create files $file_handle = fopen("$file_path/005_variation1.tmp", "w"); fclose($file_handle); stat_fn("$file_path/005_variation1.tmp"); diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 000765ccce..63b3c1db67 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index 1a7160a77a..f365174a84 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: int fileatime ( string $filename ); - Description: Returns the time the file was last accessed, or FALSE + Description: Returns the time the file was last accessed, or FALSE in case of an error. The time is returned as a Unix timestamp. Prototype: int filemtime ( string $filename ); - Description: Returns the time the file was last modified, or FALSE - in case of an error. + Description: Returns the time the file was last modified, or FALSE + in case of an error. Prototype: int filectime ( string $filename ); Description: Returns the time the file was last changed, or FALSE diff --git a/ext/standard/tests/file/006_error.phpt b/ext/standard/tests/file/006_error.phpt index 04cc274ecc..c35eba2128 100644 --- a/ext/standard/tests/file/006_error.phpt +++ b/ext/standard/tests/file/006_error.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ) - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index ba29a17509..410f923a86 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index c4649cd4a0..19bbf60fe9 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -24,7 +24,7 @@ unlink($filename); Description: Returns the permissions on the file, or FALSE in case of an error Prototype: bool chmod ( string $filename, int $mode ); - Description: Attempts to change the mode of the file specified by + Description: Attempts to change the mode of the file specified by filename to that given in mode */ diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt index 38461df97a..9fb473b368 100644 --- a/ext/standard/tests/file/007_basic.phpt +++ b/ext/standard/tests/file/007_basic.phpt @@ -3,7 +3,7 @@ Test fopen(), fclose() & feof() functions: basic functionality --FILE-- <?php /* - Prototype: resource fopen(string $filename, string $mode + Prototype: resource fopen(string $filename, string $mode [, bool $use_include_path [, resource $context]] ); Description: Opens file or URL. diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 2b315a5cac..93a6a23e5f 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -13,8 +13,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com> Description: Closes an open file pointer Prototype: bool feof ( resource $handle ) - Description: Returns TRUE if the file pointer is at EOF or an error occurs - (including socket timeout); otherwise returns FALSE. + Description: Returns TRUE if the file pointer is at EOF or an error occurs + (including socket timeout); otherwise returns FALSE. */ echo "*** Testing error conditions for fopen(), fclsoe() & feof() ***\n"; @@ -29,7 +29,7 @@ $fp = fopen(__FILE__, "r"); fclose($fp); var_dump( fclose($fp) ); // closed handle var_dump( fclose(__FILE__) ); // invalid handle -var_dump( fclose() ); // zero argument +var_dump( fclose() ); // zero argument //feof() var_dump( feof($fp) ); // closed handle diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index cdbcb0bf3a..2731b3bdc9 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r" mode +Test fopen and fclose() functions - usage variations - "r" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt index f75208e2f2..3093535e64 100644 --- a/ext/standard/tests/file/007_variation10.phpt +++ b/ext/standard/tests/file/007_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+t" mode +Test fopen and fclose() functions - usage variations - "r+t" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt index b8ff42424b..68b8396639 100644 --- a/ext/standard/tests/file/007_variation11-win32-mb.phpt +++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index 21ec9f9347..242b38cada 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt index fe299325be..92ec32eb22 100644 --- a/ext/standard/tests/file/007_variation11.phpt +++ b/ext/standard/tests/file/007_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wt" mode +Test fopen and fclose() functions - usage variations - "wt" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt index c4ae4b9bff..87bfc45c49 100644 --- a/ext/standard/tests/file/007_variation12-win32.phpt +++ b/ext/standard/tests/file/007_variation12-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt index 8c0c690f92..43ca4f78ff 100644 --- a/ext/standard/tests/file/007_variation12.phpt +++ b/ext/standard/tests/file/007_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+t" mode +Test fopen and fclose() functions - usage variations - "w+t" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt index 828a86a6ae..6c6d22f64e 100644 --- a/ext/standard/tests/file/007_variation13-win32.phpt +++ b/ext/standard/tests/file/007_variation13-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != "WIN" ) diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt index c5ab431fe9..6c416d1103 100644 --- a/ext/standard/tests/file/007_variation13.phpt +++ b/ext/standard/tests/file/007_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "at" mode +Test fopen and fclose() functions - usage variations - "at" mode --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == "WIN" ) diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt index 1e23976d05..af07d1652a 100644 --- a/ext/standard/tests/file/007_variation14.phpt +++ b/ext/standard/tests/file/007_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+t" mode +Test fopen and fclose() functions - usage variations - "a+t" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index f9751cb0c8..d17a89f64f 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xt" mode +Test fopen and fclose() functions - usage variations - "xt" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode /* Test fopen() and fclose(): Opening the file in "xt" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xt" mode, + checking for the warning msg when trying to open an existing file in "xt" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,7 +33,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xt"); //Opening the existing data file in 'xt' mode to check for the warning message diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index dcafc4a4d2..c48776a4cd 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+t" mode +Test fopen and fclose() functions - usage variations - "x+t" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+t" mode /* Test fopen() and fclose(): Opening the file in "x+t" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+t" mode, + checking for the warning msg when trying to open an existing file in "x+t" mode, and fclose function */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt index d9149676e9..716dbbacb7 100644 --- a/ext/standard/tests/file/007_variation17.phpt +++ b/ext/standard/tests/file/007_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rb" mode +Test fopen and fclose() functions - usage variations - "rb" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt index 879190c399..5d9b1ea212 100644 --- a/ext/standard/tests/file/007_variation18.phpt +++ b/ext/standard/tests/file/007_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+b" mode +Test fopen and fclose() functions - usage variations - "r+b" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt index 188b178f22..ebb19a0b2e 100644 --- a/ext/standard/tests/file/007_variation19.phpt +++ b/ext/standard/tests/file/007_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "wb" mode +Test fopen and fclose() functions - usage variations - "wb" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt index 8c9c38cf7c..d456214c27 100644 --- a/ext/standard/tests/file/007_variation2.phpt +++ b/ext/standard/tests/file/007_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "r+" mode +Test fopen and fclose() functions - usage variations - "r+" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt index fbe4dd8bb2..26c5bb7152 100644 --- a/ext/standard/tests/file/007_variation20.phpt +++ b/ext/standard/tests/file/007_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+b" mode +Test fopen and fclose() functions - usage variations - "w+b" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt index 91acbf298a..62d7f84568 100644 --- a/ext/standard/tests/file/007_variation21.phpt +++ b/ext/standard/tests/file/007_variation21.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "ab" mode +Test fopen and fclose() functions - usage variations - "ab" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt index b81d13f257..106cd4b6f4 100644 --- a/ext/standard/tests/file/007_variation22.phpt +++ b/ext/standard/tests/file/007_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+b" mode +Test fopen and fclose() functions - usage variations - "a+b" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index 892666b895..3c8bd2ff48 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "xb" mode +Test fopen and fclose() functions - usage variations - "xb" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode /* Test fopen() and fclose(): Opening the file in "xb" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "xb" mode, + checking for the warning msg when trying to open an existing file in "xb" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,7 +33,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xb"); //Opening the existing data file in 'xb' mode to check for the warning message diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index 200a9575a8..b9c819f0a5 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+b" mode +Test fopen and fclose() functions - usage variations - "x+b" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+b" mode /* Test fopen() and fclose(): Opening the file in "x+b" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+b" mode, + checking for the warning msg when trying to open an existing file in "x+b" mode, and fclose function */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt index aa27db85c0..b2a276cacf 100644 --- a/ext/standard/tests/file/007_variation3.phpt +++ b/ext/standard/tests/file/007_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w" mode +Test fopen and fclose() functions - usage variations - "w" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt index 106890c034..417974d3be 100644 --- a/ext/standard/tests/file/007_variation4.phpt +++ b/ext/standard/tests/file/007_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "w+" mode +Test fopen and fclose() functions - usage variations - "w+" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt index 4c84f020b7..4c54f473b2 100644 --- a/ext/standard/tests/file/007_variation5.phpt +++ b/ext/standard/tests/file/007_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a" mode +Test fopen and fclose() functions - usage variations - "a" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt index cc01af149e..47bd3628d4 100644 --- a/ext/standard/tests/file/007_variation6.phpt +++ b/ext/standard/tests/file/007_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "a+" mode +Test fopen and fclose() functions - usage variations - "a+" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index e2d97704ad..9474041581 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x" mode +Test fopen and fclose() functions - usage variations - "x" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x" mode /* Test fopen() and fclose(): Opening the file in "x" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x" mode, + checking for the warning msg when trying to open an existing file in "x" mode, and fclose function */ $file_path = dirname(__FILE__); @@ -33,7 +33,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x"); //Opening the existing data file in 'x' mode to check for the warning message diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index df97596757..a57c76bd67 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "x+" mode +Test fopen and fclose() functions - usage variations - "x+" mode --FILE-- <?php /* @@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+" mode /* Test fopen() and fclose(): Opening the file in "x+" mode, checking for the file creation, write & read operations, checking for the file pointer position, - checking for the warning msg when trying to open an existing file in "x+" mode, + checking for the warning msg when trying to open an existing file in "x+" mode, and fclose function */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt index 017f4a0c5f..7d8ebbee91 100644 --- a/ext/standard/tests/file/007_variation9.phpt +++ b/ext/standard/tests/file/007_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen and fclose() functions - usage variations - "rt" mode +Test fopen and fclose() functions - usage variations - "rt" mode --FILE-- <?php /* diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt index 429030ecde..996b060cea 100644 --- a/ext/standard/tests/file/basename-win32.phpt +++ b/ext/standard/tests/file/basename-win32.phpt @@ -33,14 +33,14 @@ $file_paths = array ( array("bar.zip", "bar.zip"), array("\\foo\\bar.zip", ".zip"), array("foo\\bar.zip", ".zip"), - array("\\bar.zip", ".zip"), + array("\\bar.zip", ".zip"), /* paths with suffix and trailing slashes with suffix removal*/ array("bar.zip\\", ".zip"), array("\\bar.zip\\", ".zip"), array("\\foo\\bar.zip\\", ".zip"), array("foo\\bar.zip\\", ".zip"), - array("\\bar.zip\\", ".zip"), + array("\\bar.zip\\", ".zip"), /* paths with basename only suffix, with suffix removal*/ array("\\.zip", ".zip"), @@ -116,13 +116,13 @@ echo "\n*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "\n*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( basename() ); // more than expected no. of arguments var_dump( basename("\\blah\\tmp\\bar.zip", ".zip", ".zip") ); -// passing invalid type arguments +// passing invalid type arguments $object = new stdclass; var_dump( basename( array("string\\bar") ) ); var_dump( basename( array("string\\bar"), "bar" ) ); diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt Binary files differindex c0e7498f14..a9b4389b5a 100644 --- a/ext/standard/tests/file/basename.phpt +++ b/ext/standard/tests/file/basename.phpt diff --git a/ext/standard/tests/file/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt index 18984f0451..3a123029c0 100644 --- a/ext/standard/tests/file/basename_error.phpt +++ b/ext/standard/tests/file/basename_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test basename() function : error conditions +Test basename() function : error conditions --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/basename_variation2-win32.phpt b/ext/standard/tests/file/basename_variation2-win32.phpt index 771a160cd2..43d6de5060 100644 --- a/ext/standard/tests/file/basename_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_variation2-win32.phpt @@ -35,7 +35,7 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt index fd41d89be0..195b98a6d3 100644 --- a/ext/standard/tests/file/basename_variation2.phpt +++ b/ext/standard/tests/file/basename_variation2.phpt @@ -35,7 +35,7 @@ $suffixes = array ( "foo/bar", "foo\\bar", "/", - "\\", + "\\", ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt index cce732554e..684e538d76 100644 --- a/ext/standard/tests/file/basename_variation3.phpt +++ b/ext/standard/tests/file/basename_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test basename() function : first parameter type variations +Test basename() function : first parameter type variations --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt index 487c2274f1..2bb94870df 100644 --- a/ext/standard/tests/file/basename_variation4.phpt +++ b/ext/standard/tests/file/basename_variation4.phpt @@ -3,7 +3,7 @@ Test basename() function : second parameter type variation --FILE-- <?php /* Prototype : string basename(string path [, string suffix]) - * Description: Returns the filename component of the path + * Description: Returns the filename component of the path * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt index a68d5728d7..d1ad6b6526 100644 --- a/ext/standard/tests/file/bug26938.phpt +++ b/ext/standard/tests/file/bug26938.phpt @@ -6,14 +6,14 @@ $out = array(); $status = -1; $php = getenv('TEST_PHP_EXECUTABLE'); if (substr(PHP_OS, 0, 3) != 'WIN') { - exec($php . ' -n -r \'' + exec($php . ' -n -r \'' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' . ' print "\n";' . '}\'', $out, $status); } else { - exec($php . ' -n -r "' + exec($php . ' -n -r "' . '$lengths = array(10,20000,10000,5,10000,3);' . 'foreach($lengths as $length) {' . ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);' diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt index 03535b070a..3b234c741f 100644 --- a/ext/standard/tests/file/chmod_error.phpt +++ b/ext/standard/tests/file/chmod_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test chmod() function : error conditions +Test chmod() function : error conditions --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt index 9f3ae0bae7..13d2f1f667 100644 --- a/ext/standard/tests/file/chmod_variation3.phpt +++ b/ext/standard/tests/file/chmod_variation3.phpt @@ -1,9 +1,9 @@ --TEST-- -Test chmod() function : first parameter variation +Test chmod() function : first parameter variation --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index 2cd4b8c9d7..1eea8f65cc 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test chmod() function : second parameter variation +Test chmod() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : bool chmod(string filename, int mode) - * Description: Change file mode + * Description: Change file mode * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt index 7cf20fd749..aa1584b98a 100644 --- a/ext/standard/tests/file/copy_variation1.phpt +++ b/ext/standard/tests/file/copy_variation1.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - destination file names(numerics/strings Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: In creation of destination file names containing numerics/strings +/* Test copy() function: In creation of destination file names containing numerics/strings and checking the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 7d44d94ec4..289118240b 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - identical names +Test copy() function: usage variations - identical names --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt index 6eb8fe3ee4..1c30d361a0 100644 --- a/ext/standard/tests/file/copy_variation14.phpt +++ b/ext/standard/tests/file/copy_variation14.phpt @@ -7,7 +7,7 @@ Test copy() function: usage variations - non existing src/dest Returns TRUE on success or FALSE on failure. */ -/* Test copy(): Trying to create a copy of non-existing source in an existing destination +/* Test copy(): Trying to create a copy of non-existing source in an existing destination and an existing source in non-existing destiantion */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index 07a54075e1..6f8e9dd51d 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt index e36fee1d66..1ef9da1ae6 100644 --- a/ext/standard/tests/file/copy_variation16.phpt +++ b/ext/standard/tests/file/copy_variation16.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Testing copy() function: copying data file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt index 9e7ee25d3b..73ccc71840 100644 --- a/ext/standard/tests/file/copy_variation17.phpt +++ b/ext/standard/tests/file/copy_variation17.phpt @@ -36,7 +36,7 @@ foreach($src_file_names as $src_file_name) { var_dump( file_exists($dest_file_name) ); if( file_exists($dest_file_name) ) { - var_dump( filesize($dest_file_name) ); //size of destination + var_dump( filesize($dest_file_name) ); //size of destination unlink($dest_file_name); } diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 66208082c6..cfd28b7e66 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - stat after copy +Test copy() function: usage variations - stat after copy --FILE-- <?php /* Prototype: bool copy ( string $source, string $dest ); diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt index 28f86532c9..259412f460 100644 --- a/ext/standard/tests/file/copy_variation3-win32.phpt +++ b/ext/standard/tests/file/copy_variation3-win32.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 2d81751272..999c712385 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -30,7 +30,7 @@ $dest_files = array( "copy variation3.tmp", //file name containing blank space " copy_variation3.tmp", //file name starts with blank space "copy\tvariation3.tmp", - " ", //blank space as file name + " ", //blank space as file name ); echo "Size of the source file before copy operation => "; diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt Binary files differindex 47152d4239..f856d1665a 100644 --- a/ext/standard/tests/file/copy_variation4.phpt +++ b/ext/standard/tests/file/copy_variation4.phpt diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index b860332b06..1245191806 100644 --- a/ext/standard/tests/file/copy_variation5-win32.phpt +++ b/ext/standard/tests/file/copy_variation5-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt index c480fcc3bf..df13f4bd1a 100644 --- a/ext/standard/tests/file/copy_variation5.phpt +++ b/ext/standard/tests/file/copy_variation5.phpt @@ -12,7 +12,7 @@ if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) ) Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Checking case sensitivity in creation of destination file names +/* Test copy() function: Checking case sensitivity in creation of destination file names and the existence and size of destination files */ diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 524b21d377..9d4fb9d9c9 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt index 3213c6b436..2ce9bb3072 100644 --- a/ext/standard/tests/file/copy_variation6.phpt +++ b/ext/standard/tests/file/copy_variation6.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Test copy() function: Trying to create copy of source file +/* Test copy() function: Trying to create copy of source file into different destination dir paths given in various notations */ echo "*** Test copy() function: copying file across directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 805fa9dd13..e67375dfb5 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Returns TRUE on success or FALSE on failure. */ -/* Trying to copy the links across dir paths given in various notations +/* Trying to copy the links across dir paths given in various notations and dirs having limited access */ echo "*** Testing copy() function: copying links across different directories ***\n"; diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt index 34d5b907d9..e2817aaef3 100644 --- a/ext/standard/tests/file/copy_variation9.phpt +++ b/ext/standard/tests/file/copy_variation9.phpt @@ -1,5 +1,5 @@ --TEST-- -Test copy() function: usage variations - destination file access perms +Test copy() function: usage variations - destination file access perms --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN') diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt index 87f85230b5..1e7f016e7f 100644 --- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt +++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test function fstat() on directory wrapper +Test function fstat() on directory wrapper --FILE-- <?php $d = dirname(__FILE__); diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index 3463fcfe68..bb53255fc8 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c * Alias to functions: */ @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/', + '/usr/', ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index 9b24389976..2ae0c82c79 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test dirname() function : basic functionality +Test dirname() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c * Alias to functions: */ @@ -49,7 +49,7 @@ $paths = array( ' c:', ' c:\test\adir\afile.txt', '/usr', - '/usr/' + '/usr/' ); foreach ($paths as $path) { diff --git a/ext/standard/tests/file/dirname_error.phpt b/ext/standard/tests/file/dirname_error.phpt index 9c41241c45..4181823b92 100644 --- a/ext/standard/tests/file/dirname_error.phpt +++ b/ext/standard/tests/file/dirname_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test dirname() function : error conditions +Test dirname() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt index 7c603be92e..fd7aec1210 100644 --- a/ext/standard/tests/file/dirname_variation1.phpt +++ b/ext/standard/tests/file/dirname_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test dirname() function : usage variation +Test dirname() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string dirname(string path) - * Description: Returns the directory name component of the path + * Description: Returns the directory name component of the path * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 4cfacc6ab0..9dbbea4e31 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -10,8 +10,8 @@ memory_limit=32M <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function - * will return the number of bytes available on the corresponding + * Description: Given a string containing a directory, this function + * will return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt index 21e7bf653d..27a1c0def6 100644 --- a/ext/standard/tests/file/disk_free_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * Prototype: float disk_free_space( string directory ) * Description: Given a string containing a directory, this function will - * return the number of bytes available on the corresponding + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt index ab2ad09081..a62954c74f 100644 --- a/ext/standard/tests/file/disk_free_space_error.phpt +++ b/ext/standard/tests/file/disk_free_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function will - * return the number of bytes available on the corresponding + * Description: Given a string containing a directory, this function will + * return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt index 05c2153f70..e59079eac0 100644 --- a/ext/standard/tests/file/disk_free_space_variation.phpt +++ b/ext/standard/tests/file/disk_free_space_variation.phpt @@ -4,7 +4,7 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations <?php /* * Prototype: float disk_free_space( string directory ) - * Description: Given a string containing a directory, this function + * Description: Given a string containing a directory, this function * will return the number of bytes available on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt index cfef2a4245..b2cb79edfd 100644 --- a/ext/standard/tests/file/disk_total_space_basic.phpt +++ b/ext/standard/tests/file/disk_total_space_basic.phpt @@ -4,7 +4,7 @@ Test disk_total_space() function : basic functionality <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function will + * Description: given a string containing a directory, this function will * return the total number of bytes on the corresponding filesyatem * or disk partition. */ diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt index a3ea183194..3fe54b5320 100644 --- a/ext/standard/tests/file/disk_total_space_error-win32.phpt +++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) /* * Prototype: float disk_total_space( string $directory ); * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt index b60ad6048f..de37851d26 100644 --- a/ext/standard/tests/file/disk_total_space_error.phpt +++ b/ext/standard/tests/file/disk_total_space_error.phpt @@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN') <?php /* * Prototype: float disk_total_space( string $directory ); - * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition */ diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt index 5c2a2c612e..4e94774a74 100644 --- a/ext/standard/tests/file/disk_total_space_variation.phpt +++ b/ext/standard/tests/file/disk_total_space_variation.phpt @@ -4,8 +4,8 @@ Testing disk_total_space() functions : Usage Variations. <?php /* * Prototype: float disk_total_space( string directory ) - * Description: given a string containing a directory, this function - * will return the total number of bytes on the corresponding + * Description: given a string containing a directory, this function + * will return the total number of bytes on the corresponding * filesystem or disk partition. */ diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt index 78774e58e9..2fc2e4b855 100644 --- a/ext/standard/tests/file/feof_basic.phpt +++ b/ext/standard/tests/file/feof_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test feof() function : basic functionality +Test feof() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool feof(resource fp) - * Description: Test for end-of-file on a file pointer + * Description: Test for end-of-file on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzeof */ @@ -31,7 +31,7 @@ while (!feof($h)) { $lastline = fgets($h); } echo $previousLine; -var_dump($lastline); // this should be false +var_dump($lastline); // this should be false fclose($h); $tmpFile2 = __FILE__.".tmp2"; diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 9679f4dd00..32d6657208 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -44,7 +44,7 @@ foreach( $file_types as $type ) { fclose($file_handle); } - // opening the file in different modes + // opening the file in different modes $file_handle = fopen($file_name, $mode); if($file_handle == false) exit("Error:failed to open file $file_name"); diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index 5716a56560..0d3dbc6ef1 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -44,7 +44,7 @@ foreach( $file_types as $type ) { fclose($file_handle); } - // opening the file in different modes + // opening the file in different modes $file_handle = fopen($file_name, $mode); if($file_handle == false) exit("Error:failed to open file $file_name"); diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index d23afd8984..441ed8e299 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -45,7 +45,7 @@ foreach( $file_types as $type ) { } - // opening the file in different modes + // opening the file in different modes $file_handle = fopen($file_name, $mode); if($file_handle == false) exit("Error:failed to open file $file_name"); diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 80bbaf54f3..defce24159 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -35,7 +35,7 @@ foreach( $file_types as $type ) { if($file_handle == false) exit("Error:failed to open file $file_name"); - // fill the fill with some data if mode is append mode + // fill the fill with some data if mode is append mode if( substr($mode, 0, 1) == "a" ) fill_file($file_handle, $type, 10); diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index 574a798e29..9a0040ab73 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fflush() function: usage variations - file opened in read-only mode +Test fflush() function: usage variations - file opened in read-only mode --FILE-- <?php /* Prototype: bool fflush ( resource $handle ); diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt index 4c6daa4e7f..01f01f2361 100644 --- a/ext/standard/tests/file/fgetc_basic.phpt +++ b/ext/standard/tests/file/fgetc_basic.phpt @@ -6,7 +6,7 @@ Test fgetc() function : basic functionality Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : basic operations ***\n"; @@ -20,7 +20,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou echo "--- Outerloop iteration "; echo $outerloop_counter + 1; echo " ---\n"; - // create file file + // create file file create_files(dirname(__FILE__), 1, $file_content_types[$outerloop_counter], 0755, 1, "w", "fgetc_basic", 1); //open the file in different modes and check the working of fgetc @@ -40,16 +40,16 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou exit(); } - // perform the read file at least 6 char and check + // perform the read file at least 6 char and check for( $counter = 1; $counter <= 6; $counter++ ) { // read data from the file and check, file pointer position, feof etc var_dump( fgetc($file_handle) ); // read a char var_dump( ftell($file_handle) ); // file pointer position var_dump( feof($file_handle) ); // is it eof() - var_dump($file_handle); // dump the $file_handle to see if any thing got modifed + var_dump($file_handle); // dump the $file_handle to see if any thing got modifed } // end of for - // close the file + // close the file fclose ( $file_handle); } // end of innerloop for diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index c86241a976..6635e8d554 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -6,12 +6,12 @@ Test fgetc() function : usage variations - read when file pointer at EOF Prototype: string fgetc ( resource $handle ); Description: Gets character from file pointer */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; echo "-- Testing fgetc() with file whose file pointer is pointing to EOF --\n"; -// create a file +// create a file create_files(dirname(__FILE__), 1, "text_with_new_line", 0755, 1, "w", "fgetc_variation"); $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; @@ -20,9 +20,9 @@ $filename = dirname(__FILE__)."/fgetc_variation1.tmp"; $file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t"); $loop_counter =0; for(; $loop_counter < count($file_modes); $loop_counter++) { - // print the hearder + // print the hearder echo "-- File opened in mode : $file_modes[$loop_counter] --\n"; - // open the file + // open the file $file_handle = fopen ($filename, $file_modes[$loop_counter]); if (!$file_handle) { echo "Error: failed to open file $filename! \n"; @@ -33,11 +33,11 @@ for(; $loop_counter < count($file_modes); $loop_counter++) { var_dump( fseek($file_handle, 0, SEEK_END) ); // set file pointer to eof var_dump( feof($file_handle) ); // expected false var_dump( ftell($file_handle) ); // ensure that file pointer is at eof - var_dump( fgetc($file_handle) ); // try n read a char, none expected + var_dump( fgetc($file_handle) ); // try n read a char, none expected var_dump( feof($file_handle) ); // ensure that file pointer is at eof var_dump( ftell($file_handle) ); // file pointer position - // close the file handle + // close the file handle fclose($file_handle); } echo "Done\n"; diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt index 982433f956..d444209af4 100644 --- a/ext/standard/tests/file/fgetc_variation2.phpt +++ b/ext/standard/tests/file/fgetc_variation2.phpt @@ -12,7 +12,7 @@ Test fgetc() function : usage variations - closed handle - unset file handle */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index db4ea6fc21..aab7bbbf8f 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -12,7 +12,7 @@ Test fgetc() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgetc() with file opened in write only mode ***\n"; diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index 8f3fcabee1..e3380e0098 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetc() function : usage variations - different read modes +Test fgetc() function : usage variations - different read modes --FILE-- <?php /* diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt index e9f029e767..5fc8108a62 100644 --- a/ext/standard/tests/file/fgetcsv_variation1.phpt +++ b/ext/standard/tests/file/fgetcsv_variation1.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with all parameters specified echo "*** Testing fgetcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use the right delimiter and enclosure with max length + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt index 93c81640d5..41388fb00c 100644 --- a/ext/standard/tests/file/fgetcsv_variation10.phpt +++ b/ext/standard/tests/file/fgetcsv_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - file pointer pointing to EOF +Test fgetcsv() : usage variations - file pointer pointing to EOF --FILE-- <?php /* @@ -11,7 +11,7 @@ Test fgetcsv() : usage variations - file pointer pointing to EOF echo "*** Testing fgetcsv() : with file pointer pointing to EOF ***\n"; -/* the array is with three elements in it. Each element should be read as +/* the array is with three elements in it. Each element should be read as 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -58,25 +58,25 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); } echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; - // set the file pointer to EOF + // set the file pointer to EOF var_dump( fseek($file_handle, 0, SEEK_END) ); // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle) ); // with default args + var_dump( fgetcsv($file_handle) ); // with default args // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt index 719cbe5708..c555cf532a 100644 --- a/ext/standard/tests/file/fgetcsv_variation11.phpt +++ b/ext/standard/tests/file/fgetcsv_variation11.phpt @@ -7,13 +7,13 @@ Test fgetcsv() : usage variations - with different enclosure but same delimiter Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() by reading from a file when different enclosure that is not +/* Testing fgetcsv() by reading from a file when different enclosure that is not present in the data being read and delimiter which is present in the data */ echo "*** Testing fgetcsv() : with different enclosure but same delimiter char ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt index 9802e92120..6ae6ae61b1 100644 --- a/ext/standard/tests/file/fgetcsv_variation12.phpt +++ b/ext/standard/tests/file/fgetcsv_variation12.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,7 +70,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt index d640244b89..b7c7b6b373 100644 --- a/ext/standard/tests/file/fgetcsv_variation13.phpt +++ b/ext/standard/tests/file/fgetcsv_variation13.phpt @@ -37,7 +37,7 @@ $loop_counter = 1; fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -60,7 +60,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt index b1b588e552..44eb066e9c 100644 --- a/ext/standard/tests/file/fgetcsv_variation14.phpt +++ b/ext/standard/tests/file/fgetcsv_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - reading the blank line +Test fgetcsv() : usage variations - reading the blank line --FILE-- <?php /* @@ -36,7 +36,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -65,7 +65,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt index 9ccb247b31..212f197745 100644 --- a/ext/standard/tests/file/fgetcsv_variation15.phpt +++ b/ext/standard/tests/file/fgetcsv_variation15.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default enclosure echo "*** Testing fgetcsv() : with default enclosure ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt index 8cd27eccc6..4768cf2770 100644 --- a/ext/standard/tests/file/fgetcsv_variation16.phpt +++ b/ext/standard/tests/file/fgetcsv_variation16.phpt @@ -7,14 +7,14 @@ Test fgetcsv() : usage variations - with default enclosure & length as 0 Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character - and length value equal to zero +/* Testing fgetcsv() to read a file when provided with default enclosure character + and length value equal to zero */ echo "*** Testing fgetcsv() : with default enclosure & length as 0 ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -68,7 +68,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter) ); // check the file pointer position and if eof @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt index 61759e0a94..75cb1c5ced 100644 --- a/ext/standard/tests/file/fgetcsv_variation17.phpt +++ b/ext/standard/tests/file/fgetcsv_variation17.phpt @@ -13,8 +13,8 @@ Test fgetcsv() : usage variations - with default enclosure & length less than li echo "*** Testing fgetcsv() : with default enclosure & length less than line size ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -68,14 +68,14 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); - // read rest of the line + // read rest of the line var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt index 932858bc98..a5889ee77d 100644 --- a/ext/standard/tests/file/fgetcsv_variation18.phpt +++ b/ext/standard/tests/file/fgetcsv_variation18.phpt @@ -7,14 +7,14 @@ Test fgetcsv() : usage variations - with default enclosure and different delimit Description: Gets line from file pointer and parse for CSV fields */ -/* Testing fgetcsv() to read a file when provided with default enclosure character +/* Testing fgetcsv() to read a file when provided with default enclosure character and with delimiter character which is not in the line being read by fgetcsv() */ echo "*** Testing fgetcsv() : with default enclosure and different delimiter ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -68,7 +68,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use different delimiter than existing in file + // use different delimiter than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; var_dump( fgetcsv($file_handle, 1024, $del) ); @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt index 7278b503aa..5200b5e8e1 100644 --- a/ext/standard/tests/file/fgetcsv_variation19.phpt +++ b/ext/standard/tests/file/fgetcsv_variation19.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - with default enclosure & delimiter of two ch */ /* - Testing fgetcsv() to read a file when provided with default enclosure character - and with delimiter of two characters + Testing fgetcsv() to read a file when provided with default enclosure character + and with delimiter of two characters */ echo "*** Testing fgetcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -69,7 +69,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; var_dump( fgetcsv($file_handle, 1024, $del) ); @@ -81,7 +81,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt index b696170036..40fb910cf9 100644 --- a/ext/standard/tests/file/fgetcsv_variation2.phpt +++ b/ext/standard/tests/file/fgetcsv_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with length as 0 +Test fgetcsv() : usage variations - with length as 0 --FILE-- <?php /* @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with length as 0 echo "*** Testing fgetcsv() : with length as 0 ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt index 49a32d92df..5027d13a78 100644 --- a/ext/standard/tests/file/fgetcsv_variation20.phpt +++ b/ext/standard/tests/file/fgetcsv_variation20.phpt @@ -34,11 +34,11 @@ $loop_counter = 1; echo "Error: failed to create file $filename!\n"; exit(); } - // write line of text + // write line of text fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt index dbfc2849d8..6acbbf4f88 100644 --- a/ext/standard/tests/file/fgetcsv_variation21.phpt +++ b/ext/standard/tests/file/fgetcsv_variation21.phpt @@ -8,7 +8,7 @@ Test fgetcsv() : usage variations - with default enclosure, blank line */ /* - Testing fgetcsv() to read a file containing blank line when provided with + Testing fgetcsv() to read a file containing blank line when provided with default enclosure argument */ @@ -38,7 +38,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -62,7 +62,7 @@ $loop_counter = 1; fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop echo "Done\n"; ?> diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt index 5c3999b0d7..ed4e129eb5 100644 --- a/ext/standard/tests/file/fgetcsv_variation22.phpt +++ b/ext/standard/tests/file/fgetcsv_variation22.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointin echo "*** Testing fgetcsv() : with default enclosure, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -69,9 +69,9 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); - var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation23.phpt b/ext/standard/tests/file/fgetcsv_variation23.phpt index 84c0e0bc8b..a9b51f06a5 100644 --- a/ext/standard/tests/file/fgetcsv_variation23.phpt +++ b/ext/standard/tests/file/fgetcsv_variation23.phpt @@ -12,7 +12,7 @@ Test fgetcsv() : usage variations - empty file echo "*** Testing fgetcsv() : reading from file which is having zero content ***\n"; // try reading from file which is having zero content -// create the file and then open in read mode and try reading +// create the file and then open in read mode and try reading $filename = dirname(__FILE__) . '/fgetcsv_variation23.tmp'; $fp = fopen ($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt index 9ac3569b9e..154c6f9104 100644 --- a/ext/standard/tests/file/fgetcsv_variation24.phpt +++ b/ext/standard/tests/file/fgetcsv_variation24.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various */ /* - Testing fgetcsv() to read from a file opened in various write modes and + Testing fgetcsv() to read from a file opened in various write modes and enclosure argument with two characters */ echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use delimiter & enclosure char of two chars + // use delimiter & enclosure char of two chars fseek($file_handle, 0, SEEK_SET); $del = "++"; $enc = "%%"; @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt index 6dcb6474eb..9ba0aa15ed 100644 --- a/ext/standard/tests/file/fgetcsv_variation25.phpt +++ b/ext/standard/tests/file/fgetcsv_variation25.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - with negative length value along with enclos */ /* - Testing fgetcsv() to read from a file when provided with negative length argument + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and enclosure arguments */ echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use the right delimiter and enclosure with negative length + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt index 7ec33e6f22..53077f3372 100644 --- a/ext/standard/tests/file/fgetcsv_variation26.phpt +++ b/ext/standard/tests/file/fgetcsv_variation26.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug echo "*** Testing fgetcsv() : reading the files opened in write only mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use the right delimiter and enclosure with max length + // use the right delimiter and enclosure with max length var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -71,7 +71,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt index 15133aa870..ff10286b4c 100644 --- a/ext/standard/tests/file/fgetcsv_variation27.phpt +++ b/ext/standard/tests/file/fgetcsv_variation27.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - with negative length value along with delimi */ /* - Testing fgetcsv() to read from a file when provided with negative length argument + Testing fgetcsv() to read from a file when provided with negative length argument along with delimiter and no enclosure arguments */ echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use the right delimiter and enclosure with negative length + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10, $delimiter) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt index 1b1667325c..4facbcf1ea 100644 --- a/ext/standard/tests/file/fgetcsv_variation28.phpt +++ b/ext/standard/tests/file/fgetcsv_variation28.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - with negative length value along with neithe */ /* - Testing fgetcsv() to read from a file when provided with negative length argument + Testing fgetcsv() to read from a file when provided with negative length argument along with neither delimiter nor enclosure argument */ echo "*** Testing fgetcsv() : with negative length value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use the right delimiter and enclosure with negative length + // use the right delimiter and enclosure with negative length var_dump( fgetcsv($file_handle, -10) ); // check the file pointer position and if eof var_dump( ftell($file_handle) ); @@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt index e2a40bffd1..df4ee6c6f5 100644 --- a/ext/standard/tests/file/fgetcsv_variation29.phpt +++ b/ext/standard/tests/file/fgetcsv_variation29.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with only file handle as argument, file poin echo "*** Testing fgetcsv() : with file handle as only argument and file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,7 +70,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof @@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt index ce60f32f00..20507973db 100644 --- a/ext/standard/tests/file/fgetcsv_variation3.phpt +++ b/ext/standard/tests/file/fgetcsv_variation3.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with delimiter as NULL echo "*** Testing fgetcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -72,7 +72,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 1024, NULL, $enclosure) ); // check the file pointer position and if eof @@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation30.phpt b/ext/standard/tests/file/fgetcsv_variation30.phpt index caedfba781..2cb570c8dc 100644 --- a/ext/standard/tests/file/fgetcsv_variation30.phpt +++ b/ext/standard/tests/file/fgetcsv_variation30.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer po echo "*** Testing fgetcsv() : with file handle and length arguments, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -69,7 +69,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); var_dump( fgetcsv($file_handle, 1024) ); // check the file pointer position and if eof @@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt index 3113880393..d4e3d8a43d 100644 --- a/ext/standard/tests/file/fgetcsv_variation31.phpt +++ b/ext/standard/tests/file/fgetcsv_variation31.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file +Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file --FILE-- <?php /* @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with length and enclosure, file pointer poin echo "*** Testing fgetcsv() : with enclosure argument, file pointer pointing at end of file ***\n"; -/* the array is with two elements in it. Each element should be read as - 1st element is delimiter & 2nd element is csv fields +/* the array is with two elements in it. Each element should be read as + 1st element is delimiter & 2nd element is csv fields */ $csv_lists = array ( array(',', 'water,fruit'), @@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -70,10 +70,10 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // now file pointer should point to end of the file, try reading again + // now file pointer should point to end of the file, try reading again var_dump( feof($file_handle) ); $enc = 'z'; - var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter + var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter // check the file pointer position and if eof var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); @@ -81,7 +81,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt index 7eac3ed017..e42163bd98 100644 --- a/ext/standard/tests/file/fgetcsv_variation4.phpt +++ b/ext/standard/tests/file/fgetcsv_variation4.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with enclosure as NULL echo "*** Testing fgetcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -71,7 +71,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as 0 + // use length as 0 fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 0, $delimiter, NULL) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt index b73b7aa40e..ff18d6fe13 100644 --- a/ext/standard/tests/file/fgetcsv_variation5.phpt +++ b/ext/standard/tests/file/fgetcsv_variation5.phpt @@ -8,14 +8,14 @@ Test fgetcsv() : usage variations - with delimiter & enclosure as NULL */ /* - Testing fgetcsv() to read from a file when provided with delimiter and + Testing fgetcsv() to read from a file when provided with delimiter and enclosure values both as NULL */ echo "*** Testing fgetcsv() : with delimiter & enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -84,7 +84,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt index 20f4a3b5cb..95db326598 100644 --- a/ext/standard/tests/file/fgetcsv_variation6.phpt +++ b/ext/standard/tests/file/fgetcsv_variation6.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with length less than line size echo "*** Testing fgetcsv() : with length less than line size ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -74,7 +74,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use length as less than the actual size of the line + // use length as less than the actual size of the line fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure) ); // check the file pointer position and if eof @@ -90,7 +90,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt index 247d450cd3..2854dc766f 100644 --- a/ext/standard/tests/file/fgetcsv_variation7.phpt +++ b/ext/standard/tests/file/fgetcsv_variation7.phpt @@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default arguments value echo "*** Testing fgetcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -71,7 +71,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use only default arguments + // use only default arguments fseek($file_handle, 0, SEEK_SET); var_dump( fgetcsv($file_handle) ); // check the file pointer position and if eof @@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt index 51b6fdb546..cd518cb144 100644 --- a/ext/standard/tests/file/fgetcsv_variation8.phpt +++ b/ext/standard/tests/file/fgetcsv_variation8.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with different delimiter and enclosure echo "*** Testing fgetcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) { // call fgetcsv() to parse csv fields - // use different delimiter and enclosure than existing in file + // use different delimiter and enclosure than existing in file fseek($file_handle, 0, SEEK_SET); $del = "+"; $enc = "%"; @@ -88,7 +88,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt index 72d82c7988..dd0d788f6c 100644 --- a/ext/standard/tests/file/fgetcsv_variation9.phpt +++ b/ext/standard/tests/file/fgetcsv_variation9.phpt @@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with different delimiter but same enclosure echo "*** Testing fgetcsv() : with different delimiter but same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to beginning of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); @@ -86,7 +86,7 @@ foreach ($csv_lists as $csv_list) { fclose($file_handle); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 60a57a8dae..d5610ce1ab 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) { } echo "-- fgets() with default length, file pointer at 0 --\n"; - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index 048278cf5b..2a537b29a8 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -17,7 +17,7 @@ echo "-- Testing fgets() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgets($fp, 10, $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgets() with invalid length arguments --\n"; $len = 0; var_dump( fgets($fp, $len) ); diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index b4a86250ba..3e7eba9fb1 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -11,7 +11,7 @@ Test fgets() function : usage variations - write only modes (Bug #42036) a, ab, at, x, xb, xt */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() with file opened in write only mode ***\n"; diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt index 4c0ba2894c..fcd85ce6e0 100644 --- a/ext/standard/tests/file/fgets_variation2.phpt +++ b/ext/standard/tests/file/fgets_variation2.phpt @@ -12,7 +12,7 @@ Test fgets() function : usage variations - closed handle - unset file handle */ -// include the header for common test function +// include the header for common test function include ("file.inc"); echo "*** Testing fgets() : usage variations ***\n"; diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index 6288477fd4..8a64fbcbb0 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -40,7 +40,7 @@ foreach($file_modes as $file_mode) { rewind($file_handle); var_dump( ftell($file_handle) ); - var_dump( fgets($file_handle) ); // with default length + var_dump( fgets($file_handle) ); // with default length var_dump( ftell($file_handle) ); // ensure the file pointer position var_dump( feof($file_handle) ); // enusre if eof set diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index 788a2a5f37..b1e4a89c64 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -11,7 +11,7 @@ error_reporting(E_ALL & ~E_DEPRECATED); /* test fgetss with all read modes */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : Basic operations ***\n"; @@ -57,10 +57,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 518e39d4c9..41ebf8e1da 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -69,10 +69,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index c78fed27c1..ea76bb8a8b 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -69,10 +69,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index 4dc1fe3b45..d77689d980 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -67,10 +67,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // checking file pointer position initially var_dump( feof($file_handle) ); // confirm file pointer is not at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 6dffe554b6..13a5399406 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -19,7 +19,7 @@ echo "-- Testing fgetss() with more than expected number of arguments --\n"; $fp = fopen(__FILE__, "r"); var_dump( fgetss($fp, 100, '<p><a>', $fp) ); -// invalid length argument +// invalid length argument echo "-- Testing fgetss() with invalid length arguments --\n"; $len = 0; $allowable_tags = '<p><a>'; diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index f12127614a..b8ad242d9e 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -21,7 +21,7 @@ error_reporting(E_ALL & ~E_DEPRECATED); x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -70,10 +70,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 9f9fa1a16d..6166f8468c 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -21,7 +21,7 @@ error_reporting(E_ALL & ~E_DEPRECATED); x, xb, xt */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -66,10 +66,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed var_dump( feof($file_handle) ); // check if end of file pointer is set - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index e9d19a7a26..228d476079 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -9,7 +9,7 @@ error_reporting(E_ALL & ~E_DEPRECATED); Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); /*Test fgetss() with all read modes , reading line by line with allowable tags: <test>, <html>, <?> */ @@ -63,9 +63,9 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( feof($file_handle) ); // check if eof reached } - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index 9f61d23fc0..c1777fc495 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -73,10 +73,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( feof($file_handle) ); // check if eof reached } - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index 1d7183a9d7..53a2ac879c 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes +Test fgetss() function : usage variations - read/write modes --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -69,10 +69,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( feof($file_handle) ); // check if eof reached } - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index cd87b8bc25..91470e1d44 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -14,7 +14,7 @@ error_reporting(E_ALL & ~E_DEPRECATED); Description: Gets line from file pointer and strip HTML tags */ -// include the common file related test functions +// include the common file related test functions include ("file.inc"); echo "*** Testing fgetss() : usage variations ***\n"; @@ -67,9 +67,9 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( ftell($file_handle) ); // find out file position var_dump( feof($file_handle) ); // ensure that file pointer is at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file delete_file($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt index 77cf918749..57f1fd9059 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { @@ -73,10 +73,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( feof($file_handle) ); // ensure that file pointer is at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index a2e3baf22c..e6fc15a98c 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fgetss() function : usage variations - read/write modes, file pointer at EOF +Test fgetss() function : usage variations - read/write modes, file pointer at EOF --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -70,10 +70,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { var_dump( feof($file_handle) ); // ensure that file pointer is at eof - // close the file + // close the file fclose($file_handle); - // delete the file + // delete the file unlink($filename); } // end of for - mode_counter diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index dd9a468e57..2456b80bcd 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -18,7 +18,7 @@ var_dump( file($filename, $filename, $filename, $filename) ); // more than expe var_dump( file($filename, "INCORRECT_FLAG", NULL) ); // Incorrect flag var_dump( file($filename, 10, NULL) ); // Incorrect flag -var_dump( file("temp.tmp") ); // non existing filename +var_dump( file("temp.tmp") ); // non existing filename fclose($file_handle); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/file_exists_error.phpt b/ext/standard/tests/file/file_exists_error.phpt index fc7a7487c4..7d98e4d0a5 100644 --- a/ext/standard/tests/file/file_exists_error.phpt +++ b/ext/standard/tests/file/file_exists_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file_exists() function : error conditions +Test file_exists() function : error conditions --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 9a3122fa07..697f8334ca 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto bool file_exists(string filename) - * Description: Returns true if filename exists + * Description: Returns true if filename exists * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt index 694f930352..0cdfe5c197 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ @@ -36,7 +36,7 @@ echo "--- Done ---"; ?> --CLEAN-- <?php -//Deleting the temporary file +//Deleting the temporary file $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents_variation1.tmp"); diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt index 63fe4ea365..24f1615afc 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt @@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations - --FILE-- <?php -/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, +/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, * resource $context[, int $offset[, int $maxlen]]]] ) * Description: Reads entire file into a string */ diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index 28a66067a3..12bfd325ae 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index 6142386e63..12d740c5f0 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index a6b99be1b3..9e8de27f3f 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt index 5272489ae1..3443a4c62e 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index cd536f5617..6cc2054589 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt index 7fc63b4d9e..d0b74757d2 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt index b131a4bf54..f30cac10d2 100644 --- a/ext/standard/tests/file/file_get_contents_variation6.phpt +++ b/ext/standard/tests/file/file_get_contents_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file_get_contents() function : usage variation +Test file_get_contents() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index ad09ffb80f..27ddea0060 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ @@ -38,8 +38,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index 2217789f09..baad767d6f 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ @@ -38,8 +38,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index b762e16165..0fb662b0a8 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ @@ -32,8 +32,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index 8fa50a7b02..4928404098 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 7034efa503..97a3495d54 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index b49935a948..f4bef2ec35 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]]) - * Description: Read the entire file into a string + * Description: Read the entire file into a string * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index 9091c34ded..b6f8815cd0 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 846517d43f..ae56486d5f 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file_put_contents() function : usage variation - different data types to write +Test file_put_contents() function : usage variation - different data types to write --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index 537ced2d91..6da2c0a416 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 7c3650764d..339e9b73a7 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ @@ -35,7 +35,7 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists + //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); $line = file_get_contents($filename); diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index 475981b3ef..7f963a01fe 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ @@ -37,7 +37,7 @@ rmdir($thisTestDir); function runtest() { global $filename; - //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists + //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists // in the include path. In this case it doesn't so the file should be written in the current dir. file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH); diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index c42bf39a84..d4ee0585fd 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ @@ -42,8 +42,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index 4f8f5232d5..94cfa627d3 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ @@ -36,8 +36,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 96951a4419..095980b536 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt Binary files differindex 3cd92c5ec8..20a2861bca 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 5ed3ba34b1..64a5a67e33 100644 --- a/ext/standard/tests/file/file_put_contents_variation9.phpt +++ b/ext/standard/tests/file/file_put_contents_variation9.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int file_put_contents(string file, mixed data [, int flags [, resource context]]) - * Description: Write/Create a file with contents data and return the number of bytes written + * Description: Write/Create a file with contents data and return the number of bytes written * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt index f1b22283fa..9c3ad0e546 100644 --- a/ext/standard/tests/file/file_variation2.phpt +++ b/ext/standard/tests/file/file_variation2.phpt @@ -1,9 +1,9 @@ --TEST-- -Test file() function : first parameter variation +Test file() function : first parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt index 395047567a..014adec6d8 100644 --- a/ext/standard/tests/file/file_variation3.phpt +++ b/ext/standard/tests/file/file_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test file() function : second parameter variation +Test file() function : second parameter variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt index c5c2342fcf..103c2b0af6 100644 --- a/ext/standard/tests/file/file_variation4.phpt +++ b/ext/standard/tests/file/file_variation4.phpt @@ -1,9 +1,9 @@ --TEST-- -Test file() function : third parameter variation +Test file() function : third parameter variation --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index 1a189164f5..6debeaac7e 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ @@ -38,8 +38,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index fd0d98f604..b4f1311ef0 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ @@ -32,8 +32,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 59e5cee8b5..415150dec0 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array file(string filename [, int flags[, resource context]]) - * Description: Read entire file into an array + * Description: Read entire file into an array * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt index 63d1f45c2f..5a11259b6b 100644 --- a/ext/standard/tests/file/filesize_basic.phpt +++ b/ext/standard/tests/file/filesize_basic.phpt @@ -4,7 +4,7 @@ Test filesize() function: basic functionaity <?php /* * Prototype: int filesize ( string $filename ); - * Description: Returns the size of the file in bytes, or FALSE + * Description: Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt index 3dda0c9250..0060e66f55 100644 --- a/ext/standard/tests/file/filesize_error.phpt +++ b/ext/standard/tests/file/filesize_error.phpt @@ -4,7 +4,7 @@ Test filesize() function: error conditions <?php /* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 07fa39bd9e..888fca546b 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index 07fccac11e..30d7475fd8 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation1.phpt b/ext/standard/tests/file/filesize_variation1.phpt index ef9ef34b5e..d8d3aff27a 100644 --- a/ext/standard/tests/file/filesize_variation1.phpt +++ b/ext/standard/tests/file/filesize_variation1.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 3b0d46a95b..132ecd7e9f 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation2.phpt b/ext/standard/tests/file/filesize_variation2.phpt index d42a276f99..0379451660 100644 --- a/ext/standard/tests/file/filesize_variation2.phpt +++ b/ext/standard/tests/file/filesize_variation2.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt index 8e7a0a1289..215c767616 100644 --- a/ext/standard/tests/file/filesize_variation3-win32.phpt +++ b/ext/standard/tests/file/filesize_variation3-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation3.phpt b/ext/standard/tests/file/filesize_variation3.phpt index f70b84e619..604887d116 100644 --- a/ext/standard/tests/file/filesize_variation3.phpt +++ b/ext/standard/tests/file/filesize_variation3.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 0893b81f2f..f954401891 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 59f8df9b77..f0baedb378 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : int filesize ( string $filename ); - Description : Returns the size of the file in bytes, or FALSE + Description : Returns the size of the file in bytes, or FALSE (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filesize_variation5.phpt b/ext/standard/tests/file/filesize_variation5.phpt index 05c18a12ee..9d1338481d 100644 --- a/ext/standard/tests/file/filesize_variation5.phpt +++ b/ext/standard/tests/file/filesize_variation5.phpt @@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> <?php /* * Prototype : int filesize ( string $filename ); - * Description : Returns the size of the file in bytes, or FALSE + * Description : Returns the size of the file in bytes, or FALSE * (and generates an error of level E_WARNING) in case of an error. */ diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index 0cb1e7361a..b56c19065d 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -5,7 +5,7 @@ Test filetype() function: Basic functionality /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with files and dirs ***\n"; diff --git a/ext/standard/tests/file/filetype_error.phpt b/ext/standard/tests/file/filetype_error.phpt index b965272011..b49a5286c6 100644 --- a/ext/standard/tests/file/filetype_error.phpt +++ b/ext/standard/tests/file/filetype_error.phpt @@ -5,7 +5,7 @@ Test filetype() function: Error conditions /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing error conditions ***"; diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index e09af42570..b6b306a37a 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -14,7 +14,7 @@ if (!function_exists("posix_mkfifo")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "*** Testing filetype() with various types ***\n"; diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index 400a74dc4f..1c276a2957 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -16,7 +16,7 @@ if (!file_exists("/dev/null")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "-- Checking for char --\n"; diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index 5b453d7788..eb82a4d149 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -16,7 +16,7 @@ if (!file_exists("/dev/ram0")) { /* Prototype: string filetype ( string $filename ); Description: Returns the type of the file. Possible values are fifo, char, - dir, block, link, file, and unknown. + dir, block, link, file, and unknown. */ echo "-- Checking for block --\n"; diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index 154b41e4cd..ddfb136f64 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -4,7 +4,7 @@ Test flock() function: Basic functionality <?php /* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index 952a4d9105..ccb6274756 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -4,7 +4,7 @@ Test flock() function: Error conditions <?php /* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ @@ -23,7 +23,7 @@ $operations = array( array(), "string", "", - "\0" + "\0" ); $i = 0; diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index dfb442086e..0fd2be4606 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -4,7 +4,7 @@ Test flock() function: Variations <?php /* Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]); -Description: PHP supports a portable way of locking complete files +Description: PHP supports a portable way of locking complete files in an advisory way */ diff --git a/ext/standard/tests/file/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt index 5277874ba6..61ddb2e09c 100644 --- a/ext/standard/tests/file/fnmatch_error.phpt +++ b/ext/standard/tests/file/fnmatch_error.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing error conditions for fnmatch() ***"; diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt index cbc405eaea..b3607be58b 100644 --- a/ext/standard/tests/file/fnmatch_variation.phpt +++ b/ext/standard/tests/file/fnmatch_variation.phpt @@ -8,8 +8,8 @@ if (!function_exists('fnmatch')) --FILE-- <?php /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] ) - Description: fnmatch() checks if the passed string would match - the given shell wildcard pattern. + Description: fnmatch() checks if the passed string would match + the given shell wildcard pattern. */ echo "*** Testing fnmatch() with file and various patterns ***\n"; diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 1d533a0b87..451979e45b 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -15,7 +15,7 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ @@ -35,13 +35,13 @@ $paths = array('c:\\', 'c', '\\', '/', - 'c:'.$rootdir, + 'c:'.$rootdir, 'c:adir', 'c:\\/', 'c:\\'.$rootdir.'\\/', 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation10.tmp"; diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index b21b422166..00c2c82caa 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -14,7 +14,7 @@ if (!is_writable('c:\\fopen_variation10.tmp')) { --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ @@ -34,13 +34,13 @@ $paths = array('c:\\', 'c', '\\', '/', - 'c:'.$rootdir, + 'c:'.$rootdir, 'c:adir', 'c:\\/', 'c:\\'.$rootdir.'\\/', 'c:\\'.$rootdir.'\\', 'c:\\'.$rootdir.'/', - $unixifiedDir, + $unixifiedDir, '/sortout'); $file = "fopen_variation11.tmp"; diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 881fa77430..e39ecedf87 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index 94dea21250..76cf084029 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index 73f00a4596..8c4c23fb30 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index 465ddbcc86..b62bedfe68 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 88a450b735..0dd3d23857 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 58184edb36..3dca66841f 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 82b259057a..023586c396 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index b034523609..429650564b 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt index ad1bfb133c..069ce11170 100644 --- a/ext/standard/tests/file/fopen_variation19.phpt +++ b/ext/standard/tests/file/fopen_variation19.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt index 6837c25ce2..fb00b243fc 100644 --- a/ext/standard/tests/file/fopen_variation3.phpt +++ b/ext/standard/tests/file/fopen_variation3.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt index a2578a700d..15f9e60c5a 100644 --- a/ext/standard/tests/file/fopen_variation4.phpt +++ b/ext/standard/tests/file/fopen_variation4.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 7baac85e01..ec33e1f0bf 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 6c354c636d..a3ce051deb 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fopen() function : variation: use include path and stream context relative/absolute file +Test fopen() function : variation: use include path and stream context relative/absolute file --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 9a4335c410..9cb40a0019 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 692723dd9b..b823709eac 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index db46ce008e..bee941eb94 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : resource fopen(string filename, string mode [, bool use_include_path [, resource context]]) - * Description: Open a file or a URL and return a file pointer + * Description: Open a file or a URL and return a file pointer * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index 33b7d3ca4f..080549f03b 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -30,7 +30,7 @@ $offset_arr = array( 35, 36, 70, - /* Negative offsets, the file pointer should be at the end of file + /* Negative offsets, the file pointer should be at the end of file to get data */ -1, -5, diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt index 4458dbd124..655e2395b1 100644 --- a/ext/standard/tests/file/fpassthru_variation1.phpt +++ b/ext/standard/tests/file/fpassthru_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fpassthru(resource fp) - * Description: Output all remaining data from a file pointer + * Description: Output all remaining data from a file pointer * Source code: ext/standard/file.c * Alias to functions: gzpassthru */ diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt index c98d49c6ce..7cc3d351c7 100644 --- a/ext/standard/tests/file/fputcsv_error.phpt +++ b/ext/standard/tests/file/fputcsv_error.phpt @@ -5,7 +5,7 @@ Test fputcsv() function : error conditions /* Prototype: int fputcsv ( resource $handle [, array $fields [, string $delimiter [, string $enclosure]]] ); Description:fputcsv() formats a line (passed as a fields array) as CSV and write it to the specified file - handle. Returns the length of the written string, or FALSE on failure. + handle. Returns the length of the written string, or FALSE on failure. */ echo "*** Testing error conditions ***\n"; diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt index 7bc9823fe2..bad44ea0c3 100644 --- a/ext/standard/tests/file/fputcsv_variation1.phpt +++ b/ext/standard/tests/file/fputcsv_variation1.phpt @@ -4,15 +4,15 @@ Test fputcsv() : usage variations - with all parameters specified <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when all its parameters are provided */ echo "*** Testing fputcsv() : with all parameters specified ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt index f509a27738..69fcadbfb6 100644 --- a/ext/standard/tests/file/fputcsv_variation10.phpt +++ b/ext/standard/tests/file/fputcsv_variation10.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with line without any csv fields +Test fputcsv() : usage variations - with line without any csv fields --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with line without any csv fields echo "*** Testing fputcsv() : with no CSV format in the field ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ @@ -56,12 +56,12 @@ foreach ($fields as $field) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt index 5369478971..83e80adba2 100644 --- a/ext/standard/tests/file/fputcsv_variation11.phpt +++ b/ext/standard/tests/file/fputcsv_variation11.phpt @@ -1,18 +1,18 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure value +Test fputcsv() : usage variations - with default enclosure value --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value is provided */ echo "*** Testing fputcsv() : with default enclosure value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt index d0b5c71c1f..f177965686 100644 --- a/ext/standard/tests/file/fputcsv_variation12.phpt +++ b/ext/standard/tests/file/fputcsv_variation12.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure and different delimiter +Test fputcsv() : usage variations - with default enclosure and different delimiter --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter value @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure and different delimit echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -63,12 +63,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt index 6984614e49..0518cb7435 100644 --- a/ext/standard/tests/file/fputcsv_variation13.phpt +++ b/ext/standard/tests/file/fputcsv_variation13.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with default enclosure & delimiter of two chars +Test fputcsv() : usage variations - with default enclosure & delimiter of two chars --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -63,12 +63,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 9486b2f77f..2cbbf517ed 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -4,7 +4,7 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default enclosure value and delimiter @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -71,12 +71,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt index 60fabcac7e..5cbaed0fdd 100644 --- a/ext/standard/tests/file/fputcsv_variation2.phpt +++ b/ext/standard/tests/file/fputcsv_variation2.phpt @@ -4,15 +4,15 @@ Test fputcsv() : usage variations - with delimiter as NULL <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter is NULL */ echo "*** Testing fputcsv() : with delimiter as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt index 9712e8086c..f184ffabf2 100644 --- a/ext/standard/tests/file/fputcsv_variation3.phpt +++ b/ext/standard/tests/file/fputcsv_variation3.phpt @@ -4,15 +4,15 @@ Test fputcsv() : usage variations - with enclosure as NULL <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when enclosure is NULL */ echo "*** Testing fputcsv() : with enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt index 7c8b44e93c..02c7485d7e 100644 --- a/ext/standard/tests/file/fputcsv_variation4.phpt +++ b/ext/standard/tests/file/fputcsv_variation4.phpt @@ -4,15 +4,15 @@ Test fputcsv() : usage variations - with delimiter and enclosure as NULL <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when delimiter and enclosure is NULL */ echo "*** Testing fputcsv() : with delimiter and enclosure as NULL ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt index aa2a764a54..49f6d81d10 100644 --- a/ext/standard/tests/file/fputcsv_variation5.phpt +++ b/ext/standard/tests/file/fputcsv_variation5.phpt @@ -4,15 +4,15 @@ Test fputcsv() : usage variations - with default arguments value <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* Testing fputcsv() to write to a file when default arguments values are considered */ echo "*** Testing fputcsv() : with default arguments value ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -62,12 +62,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt index 326aa08e9d..5de601707c 100644 --- a/ext/standard/tests/file/fputcsv_variation6.phpt +++ b/ext/standard/tests/file/fputcsv_variation6.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and enclosure +Test fputcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt index fa85f4f7e5..789825de52 100644 --- a/ext/standard/tests/file/fputcsv_variation7.phpt +++ b/ext/standard/tests/file/fputcsv_variation7.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and same enclosure +Test fputcsv() : usage variations - with different delimiter and same enclosure --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt index a2b975a540..74c10852d8 100644 --- a/ext/standard/tests/file/fputcsv_variation8.phpt +++ b/ext/standard/tests/file/fputcsv_variation8.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - with same delimiter and different enclosure +Test fputcsv() : usage variations - with same delimiter and different enclosure --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ /* @@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt index 7852806a17..c4c560971a 100644 --- a/ext/standard/tests/file/fputcsv_variation9.phpt +++ b/ext/standard/tests/file/fputcsv_variation9.phpt @@ -1,10 +1,10 @@ --TEST-- -Test fputcsv() : usage variations - two chars as enclosure & delimiter +Test fputcsv() : usage variations - two chars as enclosure & delimiter --FILE-- <?php /* Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] ); - Description: Format line as CSV and write to the file pointer + Description: Format line as CSV and write to the file pointer */ @@ -12,8 +12,8 @@ Test fputcsv() : usage variations - two chars as enclosure & delimiter echo "*** Testing fputcsv() : with two chars as enclosure & delimiter ***\n"; -/* the array is with three elements in it. Each element should be read as - 1st element is delimiter, 2nd element is enclosure +/* the array is with three elements in it. Each element should be read as + 1st element is delimiter, 2nd element is enclosure and 3rd element is csv fields */ $csv_lists = array ( @@ -64,12 +64,12 @@ foreach ($csv_lists as $csv_list) { //close the file fclose($file_handle); - // print the file contents + // print the file contents var_dump( file_get_contents($filename) ); //delete file unlink($filename); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index e4ca59b916..5f009f5514 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -4,9 +4,9 @@ Test fread() function : basic functionality <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -16,7 +16,7 @@ include ("file.inc"); /* Function : function check_size(string $data, int $expect_size) Description : Check the length of the data, and compare the size with $expect_size $data : Text data. - $expect_size : Expected data length + $expect_size : Expected data length */ function check_size($data, $expect_size) { @@ -31,7 +31,7 @@ function check_size($data, $expect_size) { echo "*** Testing fread() basic operations ***\n"; /* test fread with file opened in "r" and "rb" mode only - Content with numeric and strings with it + Content with numeric and strings with it */ $file_modes = array( "r", "rb", "rt", "r+", "r+b", "r+t"); $file_content_types = array("numeric","text","text_with_new_line","alphanumeric"); @@ -54,8 +54,8 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" exit(); } - /* read file by giving the acutal length, check the length and content by calculating the - hash using md5() function + /* read file by giving the acutal length, check the length and content by calculating the + hash using md5() function */ /* Reading 1024 bytes from file, expecting 1024 bytes */ ; @@ -94,7 +94,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" var_dump(fclose($file_handle)); // now close the file } // end of inner for loop - // delete the file created + // delete the file created delete_file($filename); // delete file with name } // end of outer foreach loop echo "Done\n"; diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt index 44d2fc993c..1c4068cd97 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -4,9 +4,9 @@ Test fread() function : error conditions <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -22,7 +22,7 @@ var_dump( fread() ); echo "-- Testing fread() with more than expected number of arguments --\n"; var_dump( fread($file_handle, 10, $file_handle) ); -// invalid length argument +// invalid length argument echo "-- Testing fread() with invalid length arguments --\n"; $len = 0; var_dump( fread($file_handle, $len) ); diff --git a/ext/standard/tests/file/fread_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt index 12c66ce928..d930e55a71 100644 --- a/ext/standard/tests/file/fread_fwrite_basic.phpt +++ b/ext/standard/tests/file/fread_fwrite_basic.phpt @@ -12,9 +12,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com> /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index ce5abdb103..4066cadafe 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, read/write modes <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -18,8 +18,8 @@ Test fread() function : usage variations - read some/all chars, read/write modes include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 1109b4813a..a0c9320854 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, write only mode <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -16,8 +16,8 @@ Test fread() function : usage variations - read some/all chars, write only mode include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index a176bcd6db..a25feef5e7 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index de21a44459..e450437cb3 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 9761af8dce..af5f5e2329 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 69ea1574ad..6c6ad7ec18 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index dc893dd509..aa5ad51ba4 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype: string fread ( resource $handle [, int $length] ); - Description: reads up to length bytes from the file pointer referenced by handle. - Reading stops when up to length bytes have been read, EOF (end of file) is - reached, (for network streams) when a packet becomes available, or (after + Description: reads up to length bytes from the file pointer referenced by handle. + Reading stops when up to length bytes have been read, EOF (end of file) is + reached, (for network streams) when a packet becomes available, or (after opening userspace stream) when 8192 bytes have been read whichever comes first. */ @@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { include ("file.inc"); /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size) - Description : Read data from file of size $read_size and verifies that $expected_size no. of - bytes are read. + Description : Read data from file of size $read_size and verifies that $expected_size no. of + bytes are read. $file_handle : File Handle $read_size : No. of bytes to be read. $expect_size : Expected data length diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index eaf720c506..e421792007 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -23,7 +23,7 @@ if($file_handle == false) @fwrite($file_handle, 12345); fclose($file_handle); -// open file for reading +// open file for reading $file_handle = fopen($filename, "r"); // capturing the return value from fscanf() called without third argument $return_value = fscanf($file_handle, "%s"); diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt index e31e39688e..9ab441610c 100644 --- a/ext/standard/tests/file/fscanf_variation10.phpt +++ b/ext/standard/tests/file/fscanf_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with resource +Test fscanf() function: usage variations - float formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt index 2d6debd5c0..7b5168011f 100644 --- a/ext/standard/tests/file/fscanf_variation11.phpt +++ b/ext/standard/tests/file/fscanf_variation11.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with arrays +Test fscanf() function: usage variations - float formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt index d979517a99..89da5567f4 100644 --- a/ext/standard/tests/file/fscanf_variation13.phpt +++ b/ext/standard/tests/file/fscanf_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with boolean +Test fscanf() function: usage variations - float formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt index 0c521a2186..a49e8391df 100644 --- a/ext/standard/tests/file/fscanf_variation14.phpt +++ b/ext/standard/tests/file/fscanf_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with strings +Test fscanf() function: usage variations - string formats with strings --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt index 8c49c0cace..df4ebaa476 100644 --- a/ext/standard/tests/file/fscanf_variation16.phpt +++ b/ext/standard/tests/file/fscanf_variation16.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with resource +Test fscanf() function: usage variations - string formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt index d7e84f8d8c..899d558057 100644 --- a/ext/standard/tests/file/fscanf_variation17.phpt +++ b/ext/standard/tests/file/fscanf_variation17.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with arrays +Test fscanf() function: usage variations - string formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt index 680c4afb6f..0cf07076fe 100644 --- a/ext/standard/tests/file/fscanf_variation19.phpt +++ b/ext/standard/tests/file/fscanf_variation19.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - string formats with boolean +Test fscanf() function: usage variations - string formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index b91028af07..b79b96ba4e 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with integer values +Test fscanf() function: usage variations - integer formats with integer values --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index 81251c7b81..421f75067d 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with integer values +Test fscanf() function: usage variations - char formats with integer values --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt index bf6d97515f..50bb9e0d1d 100644 --- a/ext/standard/tests/file/fscanf_variation22.phpt +++ b/ext/standard/tests/file/fscanf_variation22.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with resource +Test fscanf() function: usage variations - char formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt index fc36f5da36..d429377e70 100644 --- a/ext/standard/tests/file/fscanf_variation23.phpt +++ b/ext/standard/tests/file/fscanf_variation23.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with arrays +Test fscanf() function: usage variations - char formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt index c5f7e9413b..c8391d8388 100644 --- a/ext/standard/tests/file/fscanf_variation25.phpt +++ b/ext/standard/tests/file/fscanf_variation25.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with boolean +Test fscanf() function: usage variations - char formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt index aaa631de81..788427188c 100644 --- a/ext/standard/tests/file/fscanf_variation26.phpt +++ b/ext/standard/tests/file/fscanf_variation26.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - char formats with chars +Test fscanf() function: usage variations - char formats with chars --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 24f34a5d81..3e44d643ee 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with integer values +Test fscanf() function: usage variations - octal formats with integer values --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt index 07e569be1b..80b52654db 100644 --- a/ext/standard/tests/file/fscanf_variation29.phpt +++ b/ext/standard/tests/file/fscanf_variation29.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with resource +Test fscanf() function: usage variations - octal formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt index 5457c9b2c6..7303454175 100644 --- a/ext/standard/tests/file/fscanf_variation30.phpt +++ b/ext/standard/tests/file/fscanf_variation30.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with arrays +Test fscanf() function: usage variations - octal formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt index f7d3cd5236..b1f0b248b5 100644 --- a/ext/standard/tests/file/fscanf_variation32.phpt +++ b/ext/standard/tests/file/fscanf_variation32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - octal formats with boolean +Test fscanf() function: usage variations - octal formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 6dfe071418..b1a2eaa703 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with integer values +Test fscanf() function: usage variations - hexa formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt index 88e86b9690..0e98f95022 100644 --- a/ext/standard/tests/file/fscanf_variation35.phpt +++ b/ext/standard/tests/file/fscanf_variation35.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with resource +Test fscanf() function: usage variations - hexa formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt index 864209f499..3bf065fde0 100644 --- a/ext/standard/tests/file/fscanf_variation36.phpt +++ b/ext/standard/tests/file/fscanf_variation36.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with arrays +Test fscanf() function: usage variations - hexa formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt index 4860ee1b5e..58327b867e 100644 --- a/ext/standard/tests/file/fscanf_variation38.phpt +++ b/ext/standard/tests/file/fscanf_variation38.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - hexa formats with boolean +Test fscanf() function: usage variations - hexa formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt index 222d6a2b8c..42a8c515d8 100644 --- a/ext/standard/tests/file/fscanf_variation39.phpt +++ b/ext/standard/tests/file/fscanf_variation39.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned int formats with integer values +Test fscanf() function: usage variations - unsigned int formats with integer values --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt index 4b5ae3073b..b1ceb085f3 100644 --- a/ext/standard/tests/file/fscanf_variation4.phpt +++ b/ext/standard/tests/file/fscanf_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with resource +Test fscanf() function: usage variations - integer formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt index 1d1afa4a56..507eac335c 100644 --- a/ext/standard/tests/file/fscanf_variation41.phpt +++ b/ext/standard/tests/file/fscanf_variation41.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with resource +Test fscanf() function: usage variations - unsigned formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt index 0bfa59b8b5..fc8f8b89ca 100644 --- a/ext/standard/tests/file/fscanf_variation42.phpt +++ b/ext/standard/tests/file/fscanf_variation42.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with arrays +Test fscanf() function: usage variations - unsigned formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt index 0b720472aa..fa51b5bca4 100644 --- a/ext/standard/tests/file/fscanf_variation44.phpt +++ b/ext/standard/tests/file/fscanf_variation44.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - unsigned formats with boolean +Test fscanf() function: usage variations - unsigned formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 703863976b..533b200c7e 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with integer values +Test fscanf() function: usage variations - scientific formats with integer values --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt index fb165ac068..cf30d4b9c2 100644 --- a/ext/standard/tests/file/fscanf_variation47.phpt +++ b/ext/standard/tests/file/fscanf_variation47.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with resource +Test fscanf() function: usage variations - scientific formats with resource --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation48.phpt b/ext/standard/tests/file/fscanf_variation48.phpt index c668dfd516..b2412fa9b8 100644 --- a/ext/standard/tests/file/fscanf_variation48.phpt +++ b/ext/standard/tests/file/fscanf_variation48.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with arrays +Test fscanf() function: usage variations - scientific formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt index 5528c15a68..a39d0b8ae1 100644 --- a/ext/standard/tests/file/fscanf_variation5.phpt +++ b/ext/standard/tests/file/fscanf_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with arrays +Test fscanf() function: usage variations - integer formats with arrays --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt index f904f61fdb..af406a147a 100644 --- a/ext/standard/tests/file/fscanf_variation50.phpt +++ b/ext/standard/tests/file/fscanf_variation50.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - scientific formats with boolean +Test fscanf() function: usage variations - scientific formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 68747729aa..46663364d0 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file opened in write only mode +Test fscanf() function: usage variations - file opened in write only mode --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt index 3fcb8f5d18..974ddef8f1 100644 --- a/ext/standard/tests/file/fscanf_variation52.phpt +++ b/ext/standard/tests/file/fscanf_variation52.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - empty file +Test fscanf() function: usage variations - empty file --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt index aa50a8140a..3cd273488d 100644 --- a/ext/standard/tests/file/fscanf_variation53.phpt +++ b/ext/standard/tests/file/fscanf_variation53.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - file pointer pointing to EOF +Test fscanf() function: usage variations - file pointer pointing to EOF --FILE-- <?php @@ -57,7 +57,7 @@ foreach($modes as $mode) { // set the file pointer to eof var_dump( fseek($file_handle, 0, SEEK_END) ); - // current location + // current location var_dump( ftell($file_handle) ); foreach($formats as $format) { diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt index ae13100617..72ba7c84a2 100644 --- a/ext/standard/tests/file/fscanf_variation54.phpt +++ b/ext/standard/tests/file/fscanf_variation54.phpt @@ -43,7 +43,7 @@ $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o"); $counter = 1; -// opening file for read +// opening file for read $file_handle = fopen($filename, "r"); if($file_handle == false) { exit("Error:failed to open file $filename"); diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index 1e02356c6b..ef34fb16d5 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - tracking file pointer while reading +Test fscanf() function: usage variations - tracking file pointer while reading --SKIPIF-- <?php if (PHP_INT_SIZE != 4) { @@ -34,7 +34,7 @@ $valid_data = array( 12345, // integer value -12345, 123.45, // float value - -123.45, + -123.45, 0x123B, // hexadecimal value 0x12ab, 0123, // octal value @@ -42,7 +42,7 @@ $valid_data = array( "abcde", // string 'abcde', 10e3, // exponential value - 10e-3 + 10e-3 ); // various formats $int_formats = array( "%d", "%f", "%s", "%o", "%x", "%u", "%c", "%e"); diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt index bf6afea277..6466193820 100644 --- a/ext/standard/tests/file/fscanf_variation7.phpt +++ b/ext/standard/tests/file/fscanf_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - integer formats with boolean +Test fscanf() function: usage variations - integer formats with boolean --FILE-- <?php diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index e81b713351..aeb7eb78cc 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fscanf() function: usage variations - float formats with float values +Test fscanf() function: usage variations - float formats with float values --FILE-- <?php diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index ded2f648f9..99324ed472 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index c9b46bfbb4..79d565d3d1 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index 9788b02041..79bbe5b50f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to beginning of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index c33e28118b..80228bbbec 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -15,9 +15,9 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all r and a modes ***\n"; $file_modes = array( "r","rb","rt","r+","r+b","r+t", diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index 4212751e62..54df01e743 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index fa6c14965f..bb3f40c220 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() without using argument whence + 2. Testing fseek() without using argument whence */ echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index b1eebf9f7e..d6c5951e83 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_SET */ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 44afc314ea..dbf579f516 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index 890b126118..946b23e65e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_SET + 2. Testing fseek() with whence = SEEK_SET */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n"; $file_modes = array( "w","wb","wt","w+","w+b","w+t", diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index b9fda93f1b..864e7eda49 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes, // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_CUR */ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index 9451c07f5f..83c6e4dcd6 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index d53a43816b..16aeb39dba 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes 2. Testing fseek() with whence = SEEK_CUR */ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index 8c3f53393c..3869e35166 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All read and append modes 2. Testing fseek() with whence = SEEK_END */ diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index 9ac2c128c5..d54c46f32a 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index 87a1703981..28b52da206 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) // include the file.inc for common functions for test include ("file.inc"); -/* Testing fseek(),ftell(),rewind() functions +/* Testing fseek(),ftell(),rewind() functions 1. All write and create with write modes - 2. Testing fseek() with whence = SEEK_END + 2. Testing fseek() with whence = SEEK_END */ echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n"; diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt index 56b2d128e8..0dda585822 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ @@ -64,7 +64,7 @@ $values = array( 'string', // object data - new testClass(), + new testClass(), // undefined data $undefined_var, diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt index 48fe1802a8..2a489358d5 100644 --- a/ext/standard/tests/file/fseek_variation2.phpt +++ b/ext/standard/tests/file/fseek_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index 99d6077b41..b40a08cc9a 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fseek() function : variation functionality beyond file boundaries +Test fseek() function : variation functionality beyond file boundaries --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : proto int fseek(resource fp, int offset [, int whence]) - * Description: Seek on a file pointer + * Description: Seek on a file pointer * Source code: ext/standard/file.c * Alias to functions: gzseek */ diff --git a/ext/standard/tests/file/ftruncate.phpt b/ext/standard/tests/file/ftruncate.phpt Binary files differindex acc4e8afa3..67b070c836 100644 --- a/ext/standard/tests/file/ftruncate.phpt +++ b/ext/standard/tests/file/ftruncate.phpt diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index cb4c6e2468..3cb6db27f8 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -17,18 +17,18 @@ echo "\n Initial file size = ".filesize($filename)."\n"; echo "-- Testing ftruncate() with less than expected number of arguments --\n"; -// zero arguments +// zero arguments var_dump( ftruncate() ); // arguments less than expected numbers var_dump( ftruncate( $file_handle ) ); -// check the first size +// check the first size var_dump( filesize($filename) ); echo "-- Testing ftruncate() with more than expected number of arguments --\n"; -// more than expected number of arguments +// more than expected number of arguments var_dump( ftruncate($file_handle, 10, 20) ); -// check the first size +// check the first size var_dump( filesize($filename) ); // test invalid arguments : non-resources @@ -53,14 +53,14 @@ echo "-- Testing ftruncate() with closed/unset file handle --\n"; // ftruncate on close file handle fclose($file_handle); var_dump( ftruncate($file_handle,10) ); -// check the first size +// check the first size var_dump( filesize($filename) ); // ftruncate on a file handle which is unset $fp = fopen($filename, "w"); unset($fp); //unset file handle var_dump( ftruncate(@$fp,10)); -// check the first size +// check the first size var_dump( filesize($filename) ); echo "Done\n"; diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index 7460492cce..abfb8e6888 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index 317e13fe73..bc512aa5c8 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index 5a84b168de..426746de8b 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) { clearstatcache(); // clear previous size value in cache var_dump( filesize($filename) ); // check the file size, should be 0 - //delete all files created + //delete all files created delete_file($filename); } //end of inner for loop }//end of outer foreach loop diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index 376f775dcf..cdb77673b7 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { exit(); } - rewind($file_handle); // file pointer to 0 + rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 5288344b20..38f70cb227 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { exit(); } - rewind($file_handle); // file pointer to 0 + rewind($file_handle); // file pointer to 0 echo "-- Testing ftruncate(): File pointer at the end --\n"; /* try to truncate it to while file pointer at the end */ diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index 03ecfee483..e63e96c38f 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index d1655a7b6d..be6b8e758f 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index 3670edd281..ebbfbd1ad7 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written, $file_content_type, 1024); //get the data of size 1024 - /* Write the data in to the file, verify the write by checking file pointer position, + /* Write the data in to the file, verify the write by checking file pointer position, eof position, and data. */ // writing 100 bytes var_dump( ftell($file_handle) ); // Expecting 0 @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) { var_dump( fclose($file_handle) ); //expected : true clearstatcache();//clears file status cache var_dump( filesize($filename) ); // expected: 2148 - var_dump(md5(file_get_contents($filename))); // hash the output + var_dump(md5(file_get_contents($filename))); // hash the output } // end of inner for loop diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index ec2305a6b1..cc0ead07f0 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -52,14 +52,14 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) { var_dump( fwrite($invalid_args[$loop_counter - 1], 10) ); } -// fwrite() on a file handle which is already closed +// fwrite() on a file handle which is already closed echo "-- Testing fwrite() with closed/unset file handle --\n"; fclose($file_handle); var_dump(fwrite($file_handle,"data")); -// fwrite on a file handle which is unset +// fwrite on a file handle which is unset $fp = fopen($filename, "w"); -unset($fp); //unset file handle +unset($fp); //unset file handle var_dump( fwrite(@$fp,"data")); echo "Done\n"; diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index dd3f5eddb9..5e2c0472c7 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -50,13 +50,13 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ var_dump( ftell($file_handle) ); // expected: 0 var_dump( fwrite($file_handle, $data_to_be_written )); var_dump( ftell($file_handle) ); // expected: 0 - var_dump( feof($file_handle) ); // expected: false + var_dump( feof($file_handle) ); // expected: false // move the file pointer to end of the file and try fwrite() fseek($file_handle, SEEK_END, 0); diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index a2e2d8d9e9..f2d67c19fc 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index 6f16deb2d7..82061a019c 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ /*overwrite first 400 bytes in the file*/ diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index b04ffd75ba..3edd3d6a5a 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer var_dump( ftell($file_handle) ); // expected: 1024 diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index c7e148efd1..9d1c16af2b 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // append the data to the file, starting from current position of the file pointer diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index 247ee4e13a..bf50c4f9c7 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index 701950dc65..65268afdd4 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) { $data_to_be_written=""; fill_buffer($data_to_be_written,$file_content_type,1024); //get the data of size 1024 - /* Write the data into the file, verify it by checking the file pointer position, eof position, + /* Write the data into the file, verify it by checking the file pointer position, eof position, filesize & by displaying the content */ // write data to the file var_dump( ftell($file_handle) ); diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt index b12af3182b..7afa91216e 100644 --- a/ext/standard/tests/file/fwrite_variation5.phpt +++ b/ext/standard/tests/file/fwrite_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test fwrite() function : usage variation +Test fwrite() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int fwrite(resource fp, string str [, int length]) - * Description: Binary-safe file write + * Description: Binary-safe file write * Source code: ext/standard/file.c * Alias to functions: bzwrite fputs gzwrite */ diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt index d7b4aa57f5..ecd47f418e 100644 --- a/ext/standard/tests/file/include_streams.phpt +++ b/ext/standard/tests/file/include_streams.phpt @@ -8,7 +8,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD' EOD; /*<?*/ -class mystream +class mystream { public $path; public $mode; @@ -32,7 +32,7 @@ class mystream $this->options = $options; $split = parse_url($path); - if ($split["host"] !== "GLOBALS" || + if ($split["host"] !== "GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt index cfa140ad52..76b8e8bc0c 100644 --- a/ext/standard/tests/file/is_dir_variation2.phpt +++ b/ext/standard/tests/file/is_dir_variation2.phpt @@ -26,7 +26,7 @@ clearstatcache(); echo "-- With symlink --\n"; symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink"); -var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks +var_dump( is_dir($file_path."/is_dir_variation2_symlink") ); //is_dir() resolves symlinks clearstatcache(); echo "-- With hardlink --"; diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt index 41826ad7ec..2070374117 100644 --- a/ext/standard/tests/file/is_dir_variation3.phpt +++ b/ext/standard/tests/file/is_dir_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_dir() function: usage variations - invalid arguments +Test is_dir() function: usage variations - invalid arguments --FILE-- <?php /* Prototype: bool is_dir ( string $dirname ); diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt index a93cd6920c..2e6d60593e 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/is_executable.tmp"; create_file($filename); $counter = 1; -/* loop to check if the file with new mode is executable +/* loop to check if the file with new mode is executable using is_executable() */ for($mode = 0000; $mode <= 0777; $mode++) { echo "-- Changing mode of file to $mode --\n"; diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt index 9f49437311..1cd0a8d209 100644 --- a/ext/standard/tests/file/is_executable_variation1.phpt +++ b/ext/standard/tests/file/is_executable_variation1.phpt @@ -47,7 +47,7 @@ $files_arr = array( "$file_path/is_executable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index 6edd2dd744..36399e189e 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -5,7 +5,7 @@ Test is_executable() function: usage variations - file/dir with diff. perms if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip not for windows'); } -// Skip if being run by root +// Skip if being run by root $filename = dirname(__FILE__)."/is_readable_root_check.tmp"; $fp = fopen($filename, 'w'); fclose($fp); diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt index 925f9963c0..b9f734d448 100644 --- a/ext/standard/tests/file/is_executable_variation3.phpt +++ b/ext/standard/tests/file/is_executable_variation3.phpt @@ -41,7 +41,7 @@ $invalid_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is an executable file */ foreach( $invalid_files as $invalid_file ) { var_dump( is_executable($invalid_file) ); diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index e3c230b26c..148b89a674 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -7,7 +7,7 @@ Test is_file() function: usage variations - diff. files Returns TRUE if the filename exists and is a regular file */ -/* Testing is_file() with file containing data, truncating its size +/* Testing is_file() with file containing data, truncating its size and the file created by touch() */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt index f1b8af55d6..0ba2324f9a 100644 --- a/ext/standard/tests/file/is_readable_variation1.phpt +++ b/ext/standard/tests/file/is_readable_variation1.phpt @@ -56,7 +56,7 @@ $files_arr = array( "$file_path/is_readable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt index dc4d3b16f3..3de5f1623e 100644 --- a/ext/standard/tests/file/is_readable_variation3.phpt +++ b/ext/standard/tests/file/is_readable_variation3.phpt @@ -40,7 +40,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a readable file */ foreach( $misc_files as $misc_file ) { var_dump( is_readable($misc_file) ); diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt index ff717a5c2f..f5cdf6a8a0 100644 --- a/ext/standard/tests/file/is_writable_variation1.phpt +++ b/ext/standard/tests/file/is_writable_variation1.phpt @@ -58,7 +58,7 @@ $files_arr = array( "$file_path/is_writable_variation1" // temp directory, exp: bool(true) ); $counter = 1; -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach($files_arr as $file) { echo "-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt index 66a80abf1e..6b79934760 100644 --- a/ext/standard/tests/file/is_writable_variation3.phpt +++ b/ext/standard/tests/file/is_writable_variation3.phpt @@ -38,7 +38,7 @@ $misc_files = array( @array(), @$file_handle ); -/* loop through to test each element in the above array +/* loop through to test each element in the above array is a writable file */ foreach( $misc_files as $misc_file ) { var_dump( is_writable($misc_file) ); diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index 1d3604e329..329f4b94df 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : basic functionality +Test lchown() function : basic functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt index 1e1ebf3e94..f4b4f5089e 100644 --- a/ext/standard/tests/file/lchown_error.phpt +++ b/ext/standard/tests/file/lchown_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lchown() function : error functionality +Test lchown() function : error functionality --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support'); diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt index 0d1476d68d..ec11e2f839 100644 --- a/ext/standard/tests/file/lstat_stat_basic.phpt +++ b/ext/standard/tests/file/lstat_stat_basic.phpt @@ -54,8 +54,8 @@ sleep(2); $new_file_stat = stat($filename); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat() and lstat() : validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true @@ -66,7 +66,7 @@ var_dump( compare_self_stat($link_stat) ); // expect true var_dump( compare_self_stat($new_file_stat) ); //expect true var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating files and link, also dump the value of stats echo "*** Testing stat() and lstat() : comparing stats (recorded before and after file/link creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index cf8213a8e4..ca5f3eaeeb 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -34,11 +34,11 @@ clearstatcache(); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index e190f465aa..311e1384e8 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - file opened using w and r mode +Test lstat() and stat() functions: usage variations - file opened using w and r mode --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index a515058421..101bb6005c 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - hardlink +Test lstat() and stat() functions: usage variations - hardlink --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -28,7 +28,7 @@ fclose($fp); echo "*** Checking lstat() and stat() on hard link ***\n"; $linkname = "$file_path/lstat_stat_variation14_hard.tmp"; -//ensure that link doesn't exists +//ensure that link doesn't exists @unlink($linkname); // create the link diff --git a/ext/standard/tests/file/lstat_stat_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt index 6ee563d684..4ac01f2035 100644 --- a/ext/standard/tests/file/lstat_stat_variation18.phpt +++ b/ext/standard/tests/file/lstat_stat_variation18.phpt @@ -38,15 +38,15 @@ class names { // directory name stored in an object $dir_name = new names("$file_path/lstat_stat_variation18"); -// file name stored in an object +// file name stored in an object $file_name = new names("$file_path/lstat_stat_variation18.tmp"); echo "\n-- Testing stat() on filename stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($file_name->var_name) ); echo "\n-- Testing stat() on directory name stored inside an object --\n"; -// dump the stat returned value +// dump the stat returned value var_dump( stat($dir_name->var_name) ); echo "\n--- Done ---"; diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt index 8dcd70c798..ad0f586f1b 100644 --- a/ext/standard/tests/file/lstat_stat_variation20.phpt +++ b/ext/standard/tests/file/lstat_stat_variation20.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - link names stored in array/object +Test lstat() and stat() functions: usage variations - link names stored in array/object --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -37,8 +37,8 @@ class names { // link name stored in an object $link_object = new names("$file_path/lstat_stat_variation20_link.tmp"); -// link name stored in side an array -// with default numeric key +// link name stored in side an array +// with default numeric key $link_array = array("$file_path/lstat_stat_variation20_link.tmp"); // with string key index diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index b828c855a3..17458d9107 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -26,7 +26,7 @@ require "$file_path/file.inc"; /* create temp directory */ $dir_name = "$file_path/lstat_stat_variation5"; -@rmdir($dir_name); //ensure that dir doesn't exists +@rmdir($dir_name); //ensure that dir doesn't exists mkdir($dir_name); // temp dir // touch a directory and check stat, there should be difference in atime diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index 3d5cc218ab..c9ac88334f 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test lstat() and stat() functions: usage variations - effects of touch() on link +Test lstat() and stat() functions: usage variations - effects of touch() on link --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt index d799befd60..cbd5c1a45d 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats with creating file/subdir in a dir +/* test the effects on stats with creating file/subdir in a dir */ /* create temp file */ diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index 3c30ae914e..7a5aa4d498 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $file_path = dirname(__FILE__); require "$file_path/file.inc"; -/* test the effects on stats by deleting file/subdir from a dir +/* test the effects on stats by deleting file/subdir from a dir */ echo "*** Testing stat() for comparing stats after the deletion of subdir and file ***\n"; diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt index ea02b62fab..cee03858cb 100644 --- a/ext/standard/tests/file/mkdir_variation1-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt index 93e7f28d32..c77c66b531 100644 --- a/ext/standard/tests/file/mkdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir() function : usage variation: try invalid pathname +Test mkdir() function : usage variation: try invalid pathname --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 220820532f..51a1c39c17 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt index cf2911273a..4c037b6bca 100644 --- a/ext/standard/tests/file/mkdir_variation3.phpt +++ b/ext/standard/tests/file/mkdir_variation3.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt index acf7e27eac..8be3ca2605 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt index c6bdc1575a..b805dee3be 100644 --- a/ext/standard/tests/file/mkdir_variation5-win32.phpt +++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ @@ -39,7 +39,7 @@ $dirs = array( $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, //trailing separators diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt index d7646a2a4f..ea60edf42f 100644 --- a/ext/standard/tests/file/mkdir_variation5.phpt +++ b/ext/standard/tests/file/mkdir_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir() function : variation: various valid and invalid paths +Test mkdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]]) - * Description: Create a directory + * Description: Create a directory * Source code: ext/standard/file.c * Alias to functions: */ @@ -37,7 +37,7 @@ $dirs = array( $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, //trailing separators diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index 88633bd451..d66f179acc 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -4,7 +4,7 @@ Test parse_ini_file() function <?php /* Prototype: array parse_ini_file(string $filename [,bool $process_sections]); Description: parse_ini_file() loads in the ini file specified in filename, - and returns the settings in it in an associative array. + and returns the settings in it in an associative array. */ $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 49636b1bb1..29e022fb13 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_ini_file() function : error conditions +Test parse_ini_file() function : error conditions --FILE-- <?php /* Prototype : proto array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt index 4e76d5133d..666ea433b1 100644 --- a/ext/standard/tests/file/parse_ini_file_variation1.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt index 09e18d8c0c..e7b9091737 100644 --- a/ext/standard/tests/file/parse_ini_file_variation2.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt index c0a3bd777d..96d44433f7 100644 --- a/ext/standard/tests/file/parse_ini_file_variation3.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt index 5af6631804..e80c25822d 100644 --- a/ext/standard/tests/file/parse_ini_file_variation4.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index 2dbff79701..5fb76b6004 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test parse_ini_file() function : usage variation +Test parse_ini_file() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index b7833fa2e8..432441ae6e 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ @@ -38,8 +38,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 8b5f1a5b6e..7d5b650cc3 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ @@ -38,8 +38,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index 4726ddafb5..a4f24e4e13 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array parse_ini_file(string filename [, bool process_sections]) - * Description: Parse configuration file + * Description: Parse configuration file * Source code: ext/standard/basic_functions.c * Alias to functions: */ @@ -32,8 +32,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index 2adf90bc94..acca647a97 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index ed2a138c1f..8545406e51 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -27,14 +27,14 @@ $paths = array ( '/usr/include/arpa', '/usr/include/arpa/', 'usr/include/arpa', - 'usr/include/arpa/', + 'usr/include/arpa/', 'c:\test\afile', 'c:\\test\\afile', 'c://test//afile', 'c:\test\afile\\', 'c:\test\prog.exe', 'c:\\test\\prog.exe', - 'c:/test/prog.exe', + 'c:/test/prog.exe', '/usr/include/arpa/inet.h', '//usr/include//arpa/inet.h', '\\', diff --git a/ext/standard/tests/file/pathinfo_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt index 75ad224de8..36d9bab5ae 100644 --- a/ext/standard/tests/file/pathinfo_variation1.phpt +++ b/ext/standard/tests/file/pathinfo_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index 38d05b50b6..a39543b18f 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt index 01fb0a7377..b8509dc8ec 100644 --- a/ext/standard/tests/file/pathinfo_variation3.phpt +++ b/ext/standard/tests/file/pathinfo_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test pathinfo() function : usage variation +Test pathinfo() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : array pathinfo(string path[, int options]) - * Description: Returns information about a certain string + * Description: Returns information about a certain string * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index 3fdba4cf12..bc12266675 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test pclose() function : usage variation +Test pclose() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index b321ba3f38..6eaeec55e2 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index ea82c7781f..53e7df1eee 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss"); // the only solution is to either put the absolute path here, or // remove variables_order= from PHP.ini (setting it in run-test's // default INI will fail too) -// -// since we can't depend on PHP.ini being set a certain way, +// +// since we can't depend on PHP.ini being set a certain way, // have to put the absolute path here. $sysroot = exec('echo %SYSTEMROOT%'); diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 812a24e5ff..7aa879b48e 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test popen() and pclose function: basic functionality +Test popen() and pclose function: basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 24a5af8ad8..a240a826b9 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt Binary files differindex 3bbc329f31..59b92ad365 100644 --- a/ext/standard/tests/file/readfile_variation10.phpt +++ b/ext/standard/tests/file/readfile_variation10.phpt diff --git a/ext/standard/tests/file/readfile_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt index 854642a36d..a22b2b4044 100644 --- a/ext/standard/tests/file/readfile_variation3.phpt +++ b/ext/standard/tests/file/readfile_variation3.phpt @@ -7,7 +7,7 @@ Test readfile() function: usage variation - include path */ /* test readfile() by providing an include path, second argument */ -// include file.inc +// include file.inc require("file.inc"); $file_path = dirname(__FILE__); diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 48a3c3084e..99ee79e40b 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt index 7afe9ba71b..bc9c064055 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -1,11 +1,11 @@ --TEST-- -Test readfile() function : usage variation +Test readfile() function : usage variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index 1a87ac785c..dca6f4df67 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index 9f6b145ad0..b41721ae4f 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -1,11 +1,11 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index 1eecda4619..b4fb0bf322 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ @@ -47,8 +47,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index c4672041b9..dde7a1ec7a 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test readfile() function : variation +Test readfile() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ @@ -47,8 +47,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index dca4d4a794..cf80caae99 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : int readfile(string filename [, bool use_include_path[, resource context]]) - * Description: Output a file or a URL + * Description: Output a file or a URL * Source code: ext/standard/file.c * Alias to functions: */ @@ -42,8 +42,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", ); diff --git a/ext/standard/tests/file/readlink_realpath_variation1.phpt b/ext/standard/tests/file/readlink_realpath_variation1.phpt index ccf0ded7f5..ab1d955778 100644 --- a/ext/standard/tests/file/readlink_realpath_variation1.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation1.phpt @@ -36,7 +36,7 @@ $obj1 = new object_temp("$name_prefix/readlink_realpath_variation1/../././readli $obj2 = new object_temp("$name_prefix/readlink_realpath_variation1/home/../..///readlink_realpath_variation1_link.tmp"); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an object --\n"; -// creating the links +// creating the links var_dump( symlink($filename, $obj1->linkname) ); var_dump( readlink($obj1->linkname) ); var_dump( realpath($obj1->linkname) ); @@ -57,7 +57,7 @@ var_dump( link($filename, $obj2->linkname) ); var_dump( readlink($obj2->linkname) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($obj2->linkname) ); -// delete the links +// delete the links unlink($obj1->linkname); unlink($obj2->linkname); diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt index f4a9c554ad..c7add6b037 100644 --- a/ext/standard/tests/file/readlink_realpath_variation2.phpt +++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt @@ -31,7 +31,7 @@ $link_arr = array ( ); echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n"; -// creating the links +// creating the links var_dump( symlink($filename, $link_arr[0]) ); var_dump( readlink($link_arr[0]) ); var_dump( realpath($link_arr[0]) ); @@ -52,7 +52,7 @@ var_dump( link($filename, $link_arr[1]) ); var_dump( readlink($link_arr[1]) ); // invalid because readlink doesn't work with hardlink var_dump( realpath($link_arr[1]) ); -// delete the links +// delete the links unlink($link_arr[0]); unlink($link_arr[1]); diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt index fe3057ad19..0c8bdb87e5 100644 --- a/ext/standard/tests/file/realpath_variation2.phpt +++ b/ext/standard/tests/file/realpath_variation2.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) --FILE-- <?php /* Prototype : string realpath(string path) - * Description: Return the resolved path + * Description: Return the resolved path * Source code: ext/standard/file.c * Alias to functions: */ @@ -19,8 +19,8 @@ echo "*** Testing realpath() : variation ***\n"; $paths = array('c:\\', 'c:', - 'c' , - '\\' , + 'c' , + '\\' , '/', 'c:temp', 'c:\\/', diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt index bc3ff2123f..828837a84d 100644 --- a/ext/standard/tests/file/rename_variation-win32.phpt +++ b/ext/standard/tests/file/rename_variation-win32.phpt @@ -41,12 +41,12 @@ foreach($src_filenames as $src_filename) { $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - // unlink the file + // unlink the file unlink($dest_filename); } diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt index c19aeee343..2f25d193f5 100644 --- a/ext/standard/tests/file/rename_variation.phpt +++ b/ext/standard/tests/file/rename_variation.phpt @@ -33,12 +33,12 @@ foreach($src_filenames as $src_filename) { fclose($fp); $dest_filename = "$file_path/rename_variation2.tmp"; var_dump( rename($src_filename, $dest_filename) ); - // ensure that file got renamed to new name + // ensure that file got renamed to new name var_dump( file_exists($src_filename) ); // expecting false var_dump( file_exists($dest_filename) ); // expecting true $counter++; - // unlink the file + // unlink the file unlink($dest_filename); } diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index 519801fbda..46a47c3e94 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -45,7 +45,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index 74c5988491..2998189bf2 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) { mkdir("$file_path/rename_variation1/"); // rename the src dir to a new dir in dest dir var_dump( rename($src_dir, $dest_dir."/new_dir") ); - // ensure that dir was renamed + // ensure that dir was renamed var_dump( file_exists($src_dir) ); // expecting false var_dump( file_exists($dest_dir."/new_dir") ); // expecting true diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt index 1ba349899b..8ee59168b1 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt index f46504d8fb..e940f78070 100644 --- a/ext/standard/tests/file/rename_variation11-win32.phpt +++ b/ext/standard/tests/file/rename_variation11-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -42,8 +42,8 @@ $allDirs = array( // relative paths $mainDir."\\".$subDir, - $mainDir."\\\\".$subDir, - $mainDir."\\\\\\".$subDir, + $mainDir."\\\\".$subDir, + $mainDir."\\\\\\".$subDir, ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir, "BADDIR", diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt index 9a1367cc6a..064daa4dfe 100644 --- a/ext/standard/tests/file/rename_variation12-win32.phpt +++ b/ext/standard/tests/file/rename_variation12-win32.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip.. for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -42,8 +42,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", ); diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt index 8f3a65acad..a423496fbc 100644 --- a/ext/standard/tests/file/rename_variation12.phpt +++ b/ext/standard/tests/file/rename_variation12.phpt @@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip.. not for Windows'); --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -42,8 +42,8 @@ $allDirs = array( // relative paths $mainDir."/".$subDir, - $mainDir."//".$subDir, - $mainDir."///".$subDir, + $mainDir."//".$subDir, + $mainDir."///".$subDir, "./".$mainDir."/../".$mainDir."/".$subDir, "BADDIR", ); diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt Binary files differindex 51e14833fb..6319d4ad61 100644 --- a/ext/standard/tests/file/rename_variation13-win32.phpt +++ b/ext/standard/tests/file/rename_variation13-win32.phpt diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index 29e13efbb8..2686150f23 100644 --- a/ext/standard/tests/file/rename_variation13.phpt +++ b/ext/standard/tests/file/rename_variation13.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rename(string old_name, string new_name[, resource context]) - * Description: Rename a file + * Description: Rename a file * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt index c4b575e922..d80a939b33 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -29,7 +29,7 @@ var_dump(symlink($filename, $linkname)); //rename the link to a new name in the same dir $dest_linkname = $file_path."/rename_variation2_soft_link2.tmp"; var_dump( rename( $linkname, $dest_linkname) ); -//ensure that link was renamed +//ensure that link was renamed clearstatcache(); var_dump( file_exists($linkname) ); // expecting false var_dump( file_exists($dest_linkname) ); // expecting true @@ -41,7 +41,7 @@ clearstatcache(); var_dump( file_exists($dest_linkname) ); // expecting false var_dump( file_exists($dest_dir."/rename_variation2_soft_link2.tmp") ); // expecting true -// delete the link file now +// delete the link file now unlink($dest_dir."/rename_variation2_soft_link2.tmp"); echo "Done\n"; diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt index e352b7cf0d..8ea2499eed 100644 --- a/ext/standard/tests/file/rename_variation5.phpt +++ b/ext/standard/tests/file/rename_variation5.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* test rename() by trying to rename an existing file/dir/link to the same name and one another */ -// create a dir +// create a dir $file_path = dirname(__FILE__); $dirname = "$file_path/rename_variation5_dir"; mkdir($dirname); diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt index 7be25949f6..b3a1797c7a 100644 --- a/ext/standard/tests/file/rename_variation8-win32.phpt +++ b/ext/standard/tests/file/rename_variation8-win32.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt index 6e236c376c..2026a249bc 100644 --- a/ext/standard/tests/file/rename_variation8.phpt +++ b/ext/standard/tests/file/rename_variation8.phpt @@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) ); var_dump( file_exists($dir_name) ); // expecting false var_dump( file_exists($new_dir_name) ); // expecting true -// try to rename an non_existing dir +// try to rename an non_existing dir echo "\n*** Testing rename() on non-existing directory ***\n"; $non_existent_dir_name = $file_path."/non_existent_dir"; $new_dir_name = "$file_path/rename_basic_dir2"; diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt index 9e55ab43c3..5a958631d9 100644 --- a/ext/standard/tests/file/rmdir_variation1-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt index 090d52e534..0556266efa 100644 --- a/ext/standard/tests/file/rmdir_variation1.phpt +++ b/ext/standard/tests/file/rmdir_variation1.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 6dd30f58e7..7555200344 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt index da9afbb918..2418ccfd5f 100644 --- a/ext/standard/tests/file/rmdir_variation3-win32.phpt +++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c * Alias to functions: */ @@ -39,7 +39,7 @@ $dirs = array( $cwd.'\\.\\'.$workDir.'\\'.$subDir, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$subDir, //trailing separators @@ -51,7 +51,7 @@ $dirs = array( $cwd.'\\\\'.$workDir.'\\\\'.$subDir, // Unixified Dir - $unixifiedDir, + $unixifiedDir, ); diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt index 13dfbd3f99..fd700a0062 100644 --- a/ext/standard/tests/file/rmdir_variation3.phpt +++ b/ext/standard/tests/file/rmdir_variation3.phpt @@ -1,11 +1,11 @@ --TEST-- -Test rmdir() function : variation: various valid and invalid paths +Test rmdir() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool rmdir(string dirname[, resource context]) - * Description: Remove a directory + * Description: Remove a directory * Source code: ext/standard/file.c * Alias to functions: */ @@ -32,7 +32,7 @@ $dirs = array( $cwd.'/./'.$workDir.'/'.$subDir, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDir, //trailing separators diff --git a/ext/standard/tests/file/stat_basic-win32-mb.phpt b/ext/standard/tests/file/stat_basic-win32-mb.phpt index 0c45f5d22a..b25b38cef5 100644 --- a/ext/standard/tests/file/stat_basic-win32-mb.phpt +++ b/ext/standard/tests/file/stat_basic-win32-mb.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt index 9eb36208ba..80ed943188 100644 --- a/ext/standard/tests/file/stat_basic-win32.phpt +++ b/ext/standard/tests/file/stat_basic-win32.phpt @@ -40,17 +40,17 @@ sleep(2); $new_dir_stat = stat($dirname); clearstatcache(); -// stat contains 13 different values stored twice, can be accessed using -// numeric and named keys, compare them to see they are same +// stat contains 13 different values stored twice, can be accessed using +// numeric and named keys, compare them to see they are same echo "*** Testing stat(): validating the values stored in stat ***\n"; // Initial stat values var_dump( compare_self_stat($file_stat) ); //expect true var_dump( compare_self_stat($dir_stat) ); //expect true -// New stat values taken after creation of file +// New stat values taken after creation of file var_dump( compare_self_stat($new_dir_stat) ); // expect true -// compare the two stat values, initial stat and stat recorded after +// compare the two stat values, initial stat and stat recorded after // creating file, also dump the value of stats echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n"; echo "-- comparing difference in dir stats before and after creating file in it --\n"; diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index d49f5244f7..f5c0a9de1f 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index 0dcf271d99..a8e1a03c8f 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -39,11 +39,11 @@ sleep(2); var_dump( rename($old_filename, $new_filename) ); $new_stat = stat($new_filename); -// compare the self stat +// compare the self stat var_dump( compare_self_stat($old_stat) ); var_dump( compare_self_stat($new_stat) ); -// compare the two stats +// compare the two stats var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) ); // clear the cache clearstatcache(); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt index 416e6ae323..09fb35c973 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt @@ -50,7 +50,7 @@ $files = array ( ); $counter = 1; -/* create soft/hard link to the file +/* create soft/hard link to the file and check linkinfo() and is_link() on the link created */ foreach($files as $file) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt index 837bc5b961..12e5da17e8 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt @@ -23,7 +23,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* Variation 1 : Creating links across directories where linkname is stored as an object and array member */ -// creating temp directory which will contain temp file and links created +// creating temp directory which will contain temp file and links created $file_path = dirname(__FILE__); $dirname = "$file_path/symlink_link_linkinfo_is_link_variation1/test/home"; mkdir($dirname, 0777, true); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index dc353e5097..edb2889d41 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 3 : Create file and a soft link to the file - Access data of the file through the soft link + Access data of the file through the soft link Update the file through soft link Check size of file and soft link link */ diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index 9c0c8ab8d0..c69d2d2b04 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { */ /* Variation 4 : Create file and a hard link to the file - Access data of the file through the hard link + Access data of the file through the hard link Update the file through hard link Check size of file and hard link */ diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt index e2f30cdfda..d738373856 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt @@ -51,7 +51,7 @@ echo "\n-- Working with soft links --\n"; $linkname = "$dirname/non_existent_link_variation5.tmp"; // expected: false -var_dump( symlink($filename, $linkname) ); // this link won't get created +var_dump( symlink($filename, $linkname) ); // this link won't get created var_dump( linkinfo($linkname) ); var_dump( is_link($linkname) ); // clear the cache diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt index 82ca75b64d..df63dcfc5d 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt @@ -33,7 +33,7 @@ $linkname = "$dir/symlink_link_linkinfo_is_link_link_variation7.tmp"; $dirname = "$dir/home/test"; mkdir($dirname, 0755, true); -// create file +// create file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt index aacbcd4b3f..8a771b27b9 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt @@ -21,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { Description: Gets information about a link */ -/* Variation 9 : Check lstat of soft/hard link created +/* Variation 9 : Check lstat of soft/hard link created Check linkinfo() value with lstat['dev'] */ // temp file used @@ -34,7 +34,7 @@ $soft_link = "$dirname/symlink_link_linkinfo_is_link_softlink_variation9.tmp"; // hard link name used $hard_link = "$dirname/symlink_link_linkinfo_is_link_hardlink_variation9.tmp"; -// create the file +// create the file $fp = fopen($filename, "w"); fclose($fp); diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt index 339ac7c0a9..3e659c092c 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt index e57b677a2b..a571a7cd5b 100644 --- a/ext/standard/tests/file/tempnam_variation1-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt index 8d62aef2ea..dbdc396656 100644 --- a/ext/standard/tests/file/tempnam_variation1.phpt +++ b/ext/standard/tests/file/tempnam_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test tempnam() function: usage variations - creating files +Test tempnam() function: usage variations - creating files --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt index b7837b68d4..47da53df01 100644 --- a/ext/standard/tests/file/tempnam_variation4-0.phpt +++ b/ext/standard/tests/file/tempnam_variation4-0.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0000 to 0350, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt index fda6beda6b..39f1fb0053 100644 --- a/ext/standard/tests/file/tempnam_variation4-1.phpt +++ b/ext/standard/tests/file/tempnam_variation4-1.phpt @@ -22,7 +22,7 @@ unlink($filename); */ /* Trying to create the file in a dir with permissions from 0351 to 0777, - Allowable permissions: files are expected to be created in the input dir + Allowable permissions: files are expected to be created in the input dir Non-allowable permissions: files are expected to be created in '/tmp' dir */ diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt index 285faa46a5..40999fef47 100644 --- a/ext/standard/tests/file/tempnam_variation7-win32.phpt +++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) != "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt index 230a9a7212..4a5ffcd332 100644 --- a/ext/standard/tests/file/tempnam_variation7.phpt +++ b/ext/standard/tests/file/tempnam_variation7.phpt @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") Description: Create file with unique file name. */ -/* Passing invalid/non-existing args for $dir, +/* Passing invalid/non-existing args for $dir, hence the unique files will be created in temporary dir */ echo "*** Testing tempnam() with invalid/non-existing directory names ***\n"; diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt index eea2a50c68..9a87ac60a6 100644 --- a/ext/standard/tests/file/touch_basic-win32-mb.phpt +++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt index 7af7d535a5..ff0b9d944b 100644 --- a/ext/standard/tests/file/touch_basic-win32.phpt +++ b/ext/standard/tests/file/touch_basic-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt index b7832c9fbb..a4c319aefa 100644 --- a/ext/standard/tests/file/touch_basic.phpt +++ b/ext/standard/tests/file/touch_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : basic functionality +Test touch() function : basic functionality --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : proto bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index e7b8d1b2ac..a3bea53c90 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt index a4735275d8..8e2b8ca9bb 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt index 56f82192d4..7cf338a949 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt index ae9e32d7c7..91dcbf4678 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt index 687e01e513..30298087b3 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 48467ade8c..37fc45c234 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt index 46993afc7e..4c704ccaca 100644 --- a/ext/standard/tests/file/touch_variation5.phpt +++ b/ext/standard/tests/file/touch_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ @@ -36,7 +36,7 @@ $paths = array( $cwd.'/./'.$workDir.'/'.$subDirOrFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$subDirOrFile, //trailing separators diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index 7366420332..fa4ff7f5cf 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test touch() function : variation: various valid and invalid paths +Test touch() function : variation: various valid and invalid paths --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --SKIPIF-- @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool touch(string filename [, int time [, int atime]]) - * Description: Set modification time of file + * Description: Set modification time of file * Source code: ext/standard/filestat.c * Alias to functions: */ @@ -51,7 +51,7 @@ $paths = array( $cwd.'\\\\'.$workDir.'\\\\'.$subDirOrFile, // Unixified Dir Or File - $unixifiedDirOrFile, + $unixifiedDirOrFile, ); diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt index e0139571fe..cfe0eb8562 100644 --- a/ext/standard/tests/file/unlink_variation10.phpt +++ b/ext/standard/tests/file/unlink_variation10.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index 9c495f2c86..64c009bf91 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -1,11 +1,11 @@ --TEST-- -Test unlink() function : variation +Test unlink() function : variation --CREDITS-- Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt index cc8b722413..b4a6bd5a1f 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com> --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt index 27b63bdf2a..9ee6b49d2a 100644 --- a/ext/standard/tests/file/unlink_variation8-win32.phpt +++ b/ext/standard/tests/file/unlink_variation8-win32.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -39,7 +39,7 @@ $files = array( $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, //trailing separators diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt index 3940191f57..ab074c7849 100644 --- a/ext/standard/tests/file/unlink_variation8.phpt +++ b/ext/standard/tests/file/unlink_variation8.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -41,7 +41,7 @@ $files = array( $cwd.'/./'.$workDir.'/'.$tmpFile, $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'/BADDIR/'.$tmpFile, //trailing separators @@ -58,7 +58,7 @@ $files = array( foreach($files as $fileToUnlink) { test_realfile($workDir.'/'.$tmpFile, $fileToUnlink); test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, true); //soft link - test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link + test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link } unlink($fileToLinkTo); diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt index 7532785a5d..2331c9edc8 100644 --- a/ext/standard/tests/file/unlink_variation9-win32.phpt +++ b/ext/standard/tests/file/unlink_variation9-win32.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { --FILE-- <?php /* Prototype : bool unlink(string filename[, context context]) - * Description: Delete a file + * Description: Delete a file * Source code: ext/standard/file.c * Alias to functions: */ @@ -40,7 +40,7 @@ $files = array( $cwd.'\\.\\'.$workDir.'\\'.$tmpFile, $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$tmpFile, - //absolute bad path + //absolute bad path $cwd.'\\BADDIR\\'.$tmpFile, //trailing separators @@ -52,7 +52,7 @@ $files = array( $cwd.'\\\\'.$workDir.'\\\\'.$tmpFile, // Unixified File - $unixifiedFile, + $unixifiedFile, ); diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index 7f0dc1d91c..419ecc5122 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -76,11 +76,11 @@ $DATALEN = strlen($DATA); if ($n != $DATALEN) die("tmpfile stored $n bytes; should be $DATALEN!"); -class uselessstream +class uselessstream { } -class mystream +class mystream { public $path; public $mode; @@ -228,7 +228,7 @@ for ($i = 0; $i < 256; $i++) { $seeks[] = array($whence, $offset, $position); } -/* we compare the results of fgets using differing line lengths to +/* we compare the results of fgets using differing line lengths to * test the fgets layer also */ $line_lengths = array(1024, 256, 64, 16); $fail_count = 0; diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt index 2d74bfc8b3..418c35cd25 100644 --- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt +++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt @@ -29,7 +29,7 @@ if ($return_code != true) die("Failed to open file: " . $return_code); $return_code = $zipfile->addfile($testfile_zip, basename($testfile_zip)); if ($return_code != true) print("Failed to add file: " . $zipfile->getStatusString()); - + $return_code = $zipfile->close(); if ($return_code != true) die("Failed to close archive: " . $zipfile->getStatusString()); diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt index e291dd0855..6517cf88c1 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 path +Test fopen() for reading big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt index 74202fa966..98d4e0c89b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 path +Test mkdir/rmdir big5 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt index 3be40bf61e..406b925555 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt index 3002b50c22..54710fc3c8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading big5 to UTF-8 path +Test fopen() for reading big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt index abf3a76cc2..4e1ef94c00 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir big5 to UTF-8 path +Test mkdir/rmdir big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt index f204790e8e..3b3b8a558a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write big5 to UTF-8 path +Test fopen() for write big5 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_big5"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt index 7dfd7eadbf..485ff119ef 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 path +Test fopen() for reading CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt index 3abce0d0d5..db0c9a690c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 path +Test mkdir/rmdir CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt index 2a3b7390b1..7dd32c5a90 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 path +Test fopen() for write CP1251 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt index 13395d1017..14b5176415 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading CP1251 to UTF-8 path +Test fopen() for reading CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt index 193e2fdc74..7b5f71b84e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir CP1251 to UTF-8 path +Test mkdir/rmdir CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt index e552464214..84ecdbff9e 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write CP1251 to UTF-8 path +Test fopen() for write CP1251 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt index b638eb4822..2510a2d2de 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open failed\n"; -} +} remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(35) "opened an utf8 filename for reading" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt index e44849b061..3b55e18c67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt index c0b685c55b..98e5852b67 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt @@ -42,7 +42,7 @@ remove_data("file_cp1251"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt index 85a1c41f07..6fe0d968f7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt @@ -19,9 +19,9 @@ internal_encoding=cp1252 #vim: set encoding=cp1252 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "gefäß"; +$item = "gefäß"; $prefix = create_data("file", $item, 1252); $fn = $prefix . DIRECTORY_SEPARATOR . $item; @@ -34,7 +34,7 @@ remove_data("file"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\gefäß" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt index bdb1a7a878..ef5dc9397d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "hallo " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt index 059ab8dd8f..2a34746183 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt index 9ea2485eeb..293824d550 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt index cae3426e75..c5e075a944 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1252 to UTF-8 path +Test fopen() for reading cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(4) "hola" bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt index cacaf5d36d..969a115392 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1252 to UTF-8 path +Test mkdir/rmdir cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt index 3ac634134a..6119213289 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1252 to UTF-8 path +Test fopen() for write cp1252 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -39,7 +39,7 @@ remove_data("dir2_cp1252"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt index 12ae1ac7cd..24beb0d31a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 path +Test fopen() for reading cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt index 9049a65ee1..854910bc31 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 path +Test mkdir/rmdir cp1253 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt index 4c39fb5bda..79892e8ae4 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp1253"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt index c7604184d2..950c4784d8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1253 to UTF-8 path +Test fopen() for reading cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt index 7b6342ed1b..25aeb513ba 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1253 to UTF-8 path +Test mkdir/rmdir cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt index 579f78e7ef..bd8fc22ba3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1253 to UTF-8 path +Test fopen() for write cp1253 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt index 5fbcb74602..4f160c1370 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 path +Test fopen() for reading cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt index 314f78ecb8..5a72058097 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt index d2a04d905a..21f87c501a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 path +Test fopen() for write cp1254 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt index 13357217c8..7fcb0ff66d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt @@ -19,7 +19,7 @@ default_charset=cp1254 #vim: set encoding=cp1254 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "çokbaytlý iþleri"; @@ -35,7 +35,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\çokbaytlý iþleri" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt index 2e63d376c8..7a3d496f9f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1254 to UTF-8 path +Test fopen() for reading cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt index 7391c3bd9d..0cb73207e8 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1254 to UTF-8 path +Test mkdir/rmdir cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt index 8ac17416fe..ea4950974c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1254 to UTF-8 path +Test fopen() for write cp1254 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt index 8a685b68c4..01b4f7732d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 path +Test fopen() for reading cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt index 391a282a69..991d2ab615 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 path +Test mkdir/rmdir cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt index 2f38398bb5..276af84a91 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 path +Test fopen() for write cp1255 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1255"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt index 6d8b55d536..e33616ddd3 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1255 to UTF-8 path +Test fopen() for reading cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt index b73f01f729..b241210faa 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1255 to UTF-8 path +Test mkdir/rmdir cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt index 07cfcf053f..10fef62404 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1255 to UTF-8 path +Test fopen() for write cp1255 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt index 6b473abb54..617ebedddd 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt index 1a4233f2c2..341c0c01a2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt index 5c25d60fc8..e8cf5709a7 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -41,7 +41,7 @@ remove_data("dir_cp1256"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt index 3471fa7b1f..32596c2bd5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp1256 to UTF-8 path +Test fopen() for reading cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt index 4c12d76d97..fd0204aace 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp1256 to UTF-8 path +Test mkdir/rmdir cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt index 4f3108427f..ef0229a2e9 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp1256 to UTF-8 path +Test fopen() for write cp1256 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt index 52f080e2c2..efc43f3513 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt @@ -47,7 +47,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sà»ç¹á¿éÁ·Õè·´Êͺ1.txt string(%d) "à»ç¹á¿éÁ·Õè·´Êͺ1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt index 6cb2fb7eee..aa877d7406 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt @@ -19,10 +19,10 @@ internal_encoding=cp874 #vim: set encoding=cp874 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; -$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; +$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; $prefix = create_data("file_cp874", $item, 874); $fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item; @@ -35,7 +35,7 @@ remove_data("file_cp874"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\à»ç¹á¿éÁ·Õè·´Êͺ11" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt index 8d32f88a8c..2c244997b6 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt @@ -44,7 +44,7 @@ foreach ($names as $name) { ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- Active code page: %d getting basename of %sเป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š1.txt string(%d) "เป็นà¹à¸Ÿà¹‰à¸¡à¸—ี่ทดสà¸à¸š1.txt" diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt index 1835f0d360..48e55981ca 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 path +Test fopen() for reading cp932 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt index f7f24c045d..b177e2d1e2 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt @@ -40,7 +40,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt index d529f6a484..595f86213a 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt @@ -41,7 +41,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt index db31c1ad7a..95992ae79f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt @@ -19,7 +19,7 @@ internal_encoding=cp932 #vim: set encoding=cp932 */ -include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; $item = "ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77"; // cp932 string @@ -35,7 +35,7 @@ remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒgEƒpƒX77" bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt index a04c14d276..5e0e67b662 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp932 to UTF-8 path +Test fopen() for reading cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt index 9b13922a7a..2092e40da0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp932 to UTF-8 path +Test mkdir/rmdir cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt index fbe290468c..bd9b1791ea 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp932 to UTF-8 path +Test fopen() for write cp932 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt index bcaa31353f..46db0ebc4b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 path +Test fopen() for reading cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -31,13 +31,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt index 9edb6d1301..9eb1f08217 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 path +Test mkdir/rmdir cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt index 2c05c313e9..eedee97bd0 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 path +Test fopen() for write cp936 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -43,7 +43,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt index 554a05d94c..b0b709c0cc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading cp936 to UTF-8 path +Test fopen() for reading cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(%d) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt index 79bdfa4283..2c4b2876c5 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir cp936 to UTF-8 path +Test mkdir/rmdir cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt index 22b64c31f9..b260b7b37f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write cp936 to UTF-8 path +Test fopen() for write cp936 to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -40,7 +40,7 @@ remove_data("file_cp936"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt index 0ff640aa35..4b2bae974f 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading eucjp to UTF-8 path +Test fopen() for reading eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -28,13 +28,13 @@ if ($f) { var_dump(fclose($f)); } else { echo "open utf8 failed\n"; -} +} remove_data("file_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) string(37) "reading file wihh multibyte filename " diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt index 5a481e8d12..db3f1d861b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir eucjp to UTF-8 path +Test mkdir/rmdir eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -37,7 +37,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt index 50727a9d71..0d06fb2489 100644 --- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write eucjp to UTF-8 path +Test fopen() for write eucjp to UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; @@ -38,7 +38,7 @@ remove_data("dir_eucjp"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- resource(%d) of type (stream) int(25) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt index a287847352..51f1bb945b 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for reading Kartuli UTF-8 path +Test fopen() for reading Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt index 8f15596d38..ff32d75869 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mkdir/rmdir Kartuli UTF-8 path +Test mkdir/rmdir Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt index 6b0f864cc2..192072760c 100644 --- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fopen() for write Kartuli UTF-8 path +Test fopen() for write Kartuli UTF-8 path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt index 0dcbba2480..5cc697c0fc 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt @@ -1,5 +1,5 @@ --TEST-- -Mkdir with path length < 260 and > 248 has be a long path +Mkdir with path length < 260 and > 248 has be a long path --SKIPIF-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 0999f7c6b9..fd2a4bd4ca 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stream_filter_remove() function : basic functionality +Test stream_filter_remove() function : basic functionality --SKIPIF-- <?php $filters = stream_get_filters(); @@ -8,7 +8,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available --FILE-- <?php /* Prototype : bool stream_filter_remove(resource stream_filter) - * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c * Alias to functions: */ diff --git a/ext/standard/tests/filters/stream_filter_remove_error.phpt b/ext/standard/tests/filters/stream_filter_remove_error.phpt index d1be672136..37820a99c4 100644 --- a/ext/standard/tests/filters/stream_filter_remove_error.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stream_filter_remove() function : error conditions +Test stream_filter_remove() function : error conditions --SKIPIF-- <?php $filters = stream_get_filters(); @@ -8,7 +8,7 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available --FILE-- <?php /* Prototype : bool stream_filter_remove(resource stream_filter) - * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource * Source code: ext/standard/streamsfuncs.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index b70bf9b8f0..378001623c 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 +Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 --FILE-- <?php diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt index 9bd7ddfb35..51a079ad53 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt @@ -1,9 +1,9 @@ --TEST-- -Test call_user_func_array() function : first parameter variation +Test call_user_func_array() function : first parameter variation --FILE-- <?php /* Prototype : mixed call_user_func_array(string function_name, array parameters) - * Description: Call a user function which is the first parameter with the arguments contained in array + * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt index efd6b76255..c8c8ce6604 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt @@ -1,9 +1,9 @@ --TEST-- -Test call_user_func_array() function : second parameter variation +Test call_user_func_array() function : second parameter variation --FILE-- <?php /* Prototype : mixed call_user_func_array(string function_name, array parameters) - * Description: Call a user function which is the first parameter with the arguments contained in array + * Description: Call a user function which is the first parameter with the arguments contained in array * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt Binary files differindex 5c6fe36523..803cc8ce0c 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt Binary files differindex 4fe2f4c95b..cc3540c406 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt index 4929362613..4f82039e2d 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt @@ -3,7 +3,7 @@ Test debug_zval_dump() function : error conditions --FILE-- <?php /* Prototype: void debug_zval_dump ( mixed $variable ); - Description: Dumps a string representation of an internal zend value + Description: Dumps a string representation of an internal zend value to output. */ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt index b14dcad344..64352105db 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt @@ -9,7 +9,7 @@ Test debug_zval_dump() function : working on objects */ /* Prototype: void zval_dump( $value ); - Description: use debug_zval_dump() to display the objects and its + Description: use debug_zval_dump() to display the objects and its reference count */ function zval_dump( $values ) { $counter = 1; diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index 68a9f7cd9e..f637bfc2e9 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -3,7 +3,7 @@ Test debug_zval_dump() function : usage variations --FILE-- <?php /* Prototype: void debug_zval_dump ( mixed $variable ); - Description: Dumps a string representation of an internal zend value + Description: Dumps a string representation of an internal zend value to output. */ diff --git a/ext/standard/tests/general_functions/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt index 136f57707c..1bb4d1151c 100644 --- a/ext/standard/tests/general_functions/floatval.phpt +++ b/ext/standard/tests/general_functions/floatval.phpt @@ -7,7 +7,7 @@ Testing floatval() and its alias doubleval() Functions */ echo "*** Testing floatval() with valid float values ***\n"; -// different valid float values +// different valid float values $valid_floats = array( 0.0, 1.0, @@ -32,7 +32,7 @@ $valid_floats = array( -.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $value ) { echo "\n*** Testing doubleval() with valid float values ***\n"; -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ foreach ($valid_floats as $value ) { @@ -57,7 +57,7 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( -2147483648, // max negative integer value 2147483648, // max positive integer value @@ -76,7 +76,7 @@ $not_float_types = array ( NULL, null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( floatval($type) ); @@ -85,7 +85,7 @@ foreach ($not_float_types as $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $type ) { var_dump( doubleval($type) ); @@ -99,7 +99,7 @@ echo "\n*** Testing error conditions ***\n"; var_dump( floatval() ); var_dump( doubleval() ); -//arguments more than expected +//arguments more than expected var_dump( floatval(TRUE, FALSE) ); var_dump( doubleval(TRUE, FALSE) ); diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt index 129aa87b3c..71f4e0d139 100644 --- a/ext/standard/tests/general_functions/floatval_basic.phpt +++ b/ext/standard/tests/general_functions/floatval_basic.phpt @@ -8,7 +8,7 @@ precision = 14 * Description: Returns the float value of var. */ -// different valid float values +// different valid float values $valid_floats = array( "0.0" => 0.0, "1.0" => 1.0, @@ -33,7 +33,7 @@ $valid_floats = array( "-.5e+7" =>-.5e+7 ); -/* loop to check that floatval() recognizes different +/* loop to check that floatval() recognizes different float values, expected output:float value for valid floating point number */ echo "*** Testing floatval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { @@ -41,7 +41,7 @@ foreach ($valid_floats as $key => $value ) { var_dump( floatval($value) ); } -/* loop to check that doubleval() also recognizes different +/* loop to check that doubleval() also recognizes different float values, expected output:float value for valid floating point number */ echo "\n*** Testing doubleval() with valid float values ***\n"; foreach ($valid_floats as $key => $value ) { diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index aa808cfba1..2aafa0684c 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -14,11 +14,11 @@ fclose($fp); $dfp = opendir ( dirname(__FILE__) ); closedir($dfp); -// other types in an array +// other types in an array $not_float_types = array ( "-2147483648" => -2147483648, // max negative integer value "2147483647" => 2147483648, // max positive integer value - "file resoruce" => $fp, + "file resoruce" => $fp, "directory resource" => $dfp, "\"0.0\"" => "0.0", // string "\"1.0\"" => "1.0", @@ -33,7 +33,7 @@ $not_float_types = array ( "NULL" => NULL, "null" => null, ); -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of floatval() on non float types, expected output: float value valid floating point numbers */ echo "\n*** Testing floatval() on non floating types ***\n"; foreach ($not_float_types as $key => $type ) { @@ -43,7 +43,7 @@ foreach ($not_float_types as $key => $type ) { echo "\n*** Testing doubleval() on non floating types ***\n"; -/* loop through the $not_float_types to see working of +/* loop through the $not_float_types to see working of doubleval() on non float types, expected output: float value valid floating point numbers */ foreach ($not_float_types as $key => $type ) { echo "\n-- Iteration : $key --\n"; diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index ad40e2df7f..ec982bd55b 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_defined_constants() function : basic functionality +Test get_defined_constants() function : basic functionality --FILE-- <?php /* Prototype : array get_defined_constants ([ bool $categorize ] ) diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt index 098abd19c6..b093ed1e0c 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_defined_constants() function : error conditions +Test get_defined_constants() function : error conditions --FILE-- <?php /* Prototype : array get_defined_constants ([ bool $categorize ] ) diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt index cd0360e3ee..b809dc9d55 100644 --- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt @@ -3,8 +3,8 @@ Test get_defined_vars() function --FILE-- <?php /* Prototype: array get_defined_vars ( void ) - Description: This function returns a multidimensional array containing a list of all defined - variables, be them environment, server or user-defined variables, within the scope that + Description: This function returns a multidimensional array containing a list of all defined + variables, be them environment, server or user-defined variables, within the scope that get_defined_vars() is called. */ diff --git a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt index d3d72f301b..44bd822d12 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_extension_funcs() function : error conditions +Test get_extension_funcs() function : error conditions --FILE-- <?php /* Prototype : array get_extension_funcs ( string $module_name ) diff --git a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt index c412d1816c..ac4568c621 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_extension_funcs() function : error conditions +Test get_extension_funcs() function : error conditions --FILE-- <?php /* Prototype : array get_extension_funcs ( string $module_name ) diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt index 127378d3c1..8ce2323a39 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_loaded_extensions() function : basic functionality +Test get_loaded_extensions() function : basic functionality --FILE-- <?php /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt index 10862f4468..1728dea23f 100644 --- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt +++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_loaded_extensions() function : error conditions +Test get_loaded_extensions() function : error conditions --FILE-- <?php /* Prototype : array get_loaded_extensions ([ bool $zend_extensions= false ] ) diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt index 99ffbafdea..58a49e713f 100644 --- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_resource_type() function : basic functionality +Test get_resource_type() function : basic functionality --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt index f7457bf7f4..a010f7eba4 100644 --- a/ext/standard/tests/general_functions/get_resource_type_error.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test get_resource_type() function : error conditions +Test get_resource_type() function : error conditions --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt index df4a04b9d4..499581c05b 100644 --- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt @@ -3,7 +3,7 @@ Test get_resource_type() function : usage variations - different data types as h --FILE-- <?php /* Prototype : string get_resource_type ( resource $handle ) - * Description: Returns the resource type + * Description: Returns the resource type * Source code: Zend/zend_builtin_functions.c */ diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt index 0fe0a6afba..a2b03ee07a 100644 --- a/ext/standard/tests/general_functions/getrusage_basic.phpt +++ b/ext/standard/tests/general_functions/getrusage_basic.phpt @@ -18,7 +18,7 @@ if (!is_array($dat)) { echo "TEST FAILED : getrusage should return an array\n"; } -// echo the fields which are common to all platforms +// echo the fields which are common to all platforms echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n"; echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; ?> diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt index 04c9fb9abe..66deb91a31 100644 --- a/ext/standard/tests/general_functions/getrusage_error.phpt +++ b/ext/standard/tests/general_functions/getrusage_error.phpt @@ -29,7 +29,7 @@ $array_arg = array(1,2,3); $dat = getrusage($array_arg); echo "\n-- Testing getrusage() function with invalid argument - OBJECT --\n"; -class classA +class classA { function __toString() { return "ClassAObject"; diff --git a/ext/standard/tests/general_functions/gettype_settype_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt index af8959d9fd..325e91e47f 100644 --- a/ext/standard/tests/general_functions/gettype_settype_error.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt @@ -1,12 +1,12 @@ --TEST-- -Test gettype() & settype() functions : error conditions +Test gettype() & settype() functions : error conditions --FILE-- <?php /* Prototype: string gettype ( mixed $var ); Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test different error conditions of settype() and gettype() functions */ @@ -16,14 +16,14 @@ echo "**** Testing gettype() and settype() functions ****\n"; echo "\n*** Testing gettype(): error conditions ***\n"; //Zero arguments var_dump( gettype() ); -// args more than expected +// args more than expected var_dump( gettype( "1", "2" ) ); echo "\n*** Testing settype(): error conditions ***\n"; //Zero arguments var_dump( settype() ); -// args more than expected +// args more than expected $var = 10.5; var_dump( settype( $var, $var, "int" ) ); diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 5761f1b832..7fb8789ff3 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -12,14 +12,14 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ -/* Test usage variation of gettype() and settype() functions: - settype() to null type. +/* Test usage variation of gettype() and settype() functions: + settype() to null type. Set type of the data to "null" and verify using gettype Following are performed in the listed sequence: - get the current type of the variable + get the current type of the variable set the type of the variable to "null type" dump the variable to see its new data get the new type of the variable @@ -32,7 +32,7 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error +// settype() would fail with catachable fatal error set_error_handler("foo"); $var1 = "another string"; @@ -59,10 +59,10 @@ class point $var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, @@ -164,13 +164,13 @@ $loop_count = 1; foreach ($var_values as $var) { echo "-- Iteration $loop_count --\n"; $loop_count++; - // get the current data type + // get the current data type var_dump( gettype($var) ); - // convert it to null + // convert it to null var_dump( settype($var, $type) ); - // dump the converted data + // dump the converted data var_dump( $var ); // check the new type after conversion diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index ab9126c281..99ab02a60d 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -15,7 +15,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -35,7 +35,7 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error +// settype() would fail with catachable fatal error set_error_handler("foo"); $var1 = "another string"; @@ -62,10 +62,10 @@ class point $var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, @@ -158,7 +158,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "integer", "int" diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index ff30b3e919..71b03461eb 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,7 +32,7 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error +// settype() would fail with catachable fatal error set_error_handler("foo"); $var1 = "another string"; @@ -59,10 +59,10 @@ class point $var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, @@ -155,7 +155,7 @@ $var_values = array ( $undef_var ); -// test conversion to these types +// test conversion to these types $types = array( "float", "double" diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index 03fd9e3d9e..a14cb73dbb 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,7 +32,7 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error +// settype() would fail with catachable fatal error set_error_handler("foo"); $var1 = "another string"; @@ -63,10 +63,10 @@ class class_with_no_member { $var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, @@ -180,7 +180,7 @@ $var_values = array ( b"10string" ); -// test conversion to these types +// test conversion to these types $types = array( "boolean", "bool" diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index 9af1bfbaa8..c5e2640f9c 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 5217121385..27beaa0744 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -181,7 +181,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index 8431cb802f..dae20a1856 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -154,7 +154,7 @@ $var_values = array ( $unset_var, $undef_var ); - + /* test conversion to object type */ $type = "object"; @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index e64dd08b80..97f550e446 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -12,7 +12,7 @@ precision=14 Description: Returns the type of the PHP variable var Prototype: bool settype ( mixed &$var, string $type ); - Description: Set the type of variable var to type + Description: Set the type of variable var to type */ /* Test usage variation of gettype() and settype() functions: @@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) { echo "$errno: $errstr\n"; } //set the error handler, this is required as -// settype() would fail with catachable fatal error -set_error_handler("foo"); +// settype() would fail with catachable fatal error +set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); @@ -57,15 +57,15 @@ class point } } -$var_values = array ( +$var_values = array ( /* nulls */ - null, + null, /* boolean */ - FALSE, + FALSE, TRUE, true, - + /* strings */ "\xFF", "\x66", @@ -79,7 +79,7 @@ $var_values = array ( "10", "10string", '10string', - "1", + "1", "-1", "1e2", " 1", @@ -125,11 +125,11 @@ $var_values = array ( 0555, -0555, 02224242434343152, // an octal value > than max int - + /* floats */ 1e5, -1e5, - 1E5, + 1E5, -1E5, -1.5, .5, @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt index dc12153832..e76d7083d4 100644 --- a/ext/standard/tests/general_functions/intval_variation1.phpt +++ b/ext/standard/tests/general_functions/intval_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test intval() function : usage variation +Test intval() function : usage variation --FILE-- <?php /* Prototype : int intval(mixed var [, int base]) - * Description: Get the integer value of a variable using the optional base for the conversion + * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt index 150c7f8222..6a295308af 100644 --- a/ext/standard/tests/general_functions/intval_variation2.phpt +++ b/ext/standard/tests/general_functions/intval_variation2.phpt @@ -1,11 +1,11 @@ --TEST-- -Test intval() function : usage variation +Test intval() function : usage variation --SKIPIF-- <?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only"); --FILE-- <?php /* Prototype : int intval(mixed var [, int base]) - * Description: Get the integer value of a variable using the optional base for the conversion + * Description: Get the integer value of a variable using the optional base for the conversion * Source code: ext/standard/type.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt index 767e5d9320..223b732904 100644 --- a/ext/standard/tests/general_functions/is_array.phpt +++ b/ext/standard/tests/general_functions/is_array.phpt @@ -25,7 +25,7 @@ $arrays = array( array("string", "test"), array('string', 'test') ); -/* loop to check that is_array() recognizes different +/* loop to check that is_array() recognizes different type of arrays, expected output bool(true) */ $loop_counter = 1; foreach ($arrays as $var_array ) { @@ -39,11 +39,11 @@ echo "\n*** Testing is_array() on non array types ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// unset variables +// unset variables $unset_array = array(10); unset($unset_array); -// other types in a array +// other types in a array $varient_arrays = array ( /* integers */ 543915, @@ -70,14 +70,14 @@ $varient_arrays = array ( 1e5, /* objects */ - new stdclass, + new stdclass, /* resources */ - $fp, - $dfp, + $fp, + $dfp, /* nulls */ - null, + null, NULL, /* boolean */ @@ -90,7 +90,7 @@ $varient_arrays = array ( @$unset_array, @$undefined_array ); -/* loop through the $varient_array to see working of +/* loop through the $varient_array to see working of is_array() on non array types, expected output bool(false) */ $loop_counter = 1; foreach ($varient_arrays as $type ) { @@ -102,7 +102,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_array() ); -//arguments more than expected +//arguments more than expected var_dump( is_array ($fp, $fp) ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt index 82bed146a2..a6c6111fa1 100644 --- a/ext/standard/tests/general_functions/is_bool.phpt +++ b/ext/standard/tests/general_functions/is_bool.phpt @@ -3,18 +3,18 @@ Test is_bool() function --FILE-- <?php /* Prototype: bool is_bool ( mixed $var ); - * Description: Finds whether the given variable is a boolean + * Description: Finds whether the given variable is a boolean */ echo "*** Testing is_bool() with valid boolean values ***\n"; -// different valid boolean values +// different valid boolean values $valid_bools = array( TRUE, FALSE, true, false, ); -/* loop to check that is_bool() recognizes different +/* loop to check that is_bool() recognizes different bool values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_bools as $bool_val ) { @@ -36,7 +36,7 @@ unset ($unset_bool1); unset ($unset_bool2); unset ($unset_var); -// other types in a array +// other types in a array $not_bool_types = array ( /* integers */ 0, @@ -116,10 +116,10 @@ $not_bool_types = array ( /* unset bool vars and undefined var */ @$unset_bool1, @$unset_bool2, - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_bool_types to see working of +/* loop through the $not_bool_types to see working of is_bool() on non bull types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_bool_types as $type ) { @@ -131,7 +131,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_bool() ); -//arguments more than expected +//arguments more than expected var_dump( is_bool(TRUE, FALSE) ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index bec24c8e81..7657875311 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_callable() function : usage variations - on objects +Test is_callable() function : usage variations - on objects --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); @@ -8,7 +8,7 @@ Test is_callable() function : usage variations - on objects */ /* Prototype: void check_iscallable_objects( $methods ); - Description: use is_callable() on given $method to check if the array + Description: use is_callable() on given $method to check if the array contains a valid method name; returns true if valid function name, false otherwise */ diff --git a/ext/standard/tests/general_functions/is_callable_variation2.phpt b/ext/standard/tests/general_functions/is_callable_variation2.phpt index 5bfd4be321..af562d4ef1 100644 --- a/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_callable() function : usage variations - on invalid function names +Test is_callable() function : usage variations - on invalid function names --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt index e223047640..b71a5283db 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -7,11 +7,11 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype: bool is_float ( mixed $var ); - * Description: Finds whether the given variable is a float + * Description: Finds whether the given variable is a float */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; -// different valid float values +// different valid float values $floats = array( -2147483649, // float value 2147483648, // float value @@ -63,7 +63,7 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { var $array = array(10.5); @@ -72,7 +72,7 @@ $object = new foo(); $not_floats = array ( new foo, //object - $object, + $object, $fp, // resource $dfp, @@ -116,7 +116,7 @@ $not_floats = array ( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_floats to see working of +/* loop through the $not_floats to see working of is_float(), is_double() & is_real() on objects, arrays, boolean and others */ $loop_counter = 1; @@ -133,14 +133,14 @@ var_dump( is_float() ); var_dump( is_double() ); var_dump( is_real() ); -//arguments more than expected +//arguments more than expected var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); echo "Done\n"; -// close the resources used +// close the resources used fclose($fp); closedir($dfp); diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt index 7b20dff2ce..9410a21fe2 100644 --- a/ext/standard/tests/general_functions/is_float_64bit.phpt +++ b/ext/standard/tests/general_functions/is_float_64bit.phpt @@ -9,11 +9,11 @@ precision=14 --FILE-- <?php /* Prototype: bool is_float ( mixed $var ); - * Description: Finds whether the given variable is a float + * Description: Finds whether the given variable is a float */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; -// different valid float values +// different valid float values $floats = array( -2147483649, // float value 2147483648, // float value @@ -65,7 +65,7 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { var $array = array(10.5); @@ -74,7 +74,7 @@ $object = new foo(); $not_floats = array ( new foo, //object - $object, + $object, $fp, // resource $dfp, @@ -118,7 +118,7 @@ $not_floats = array ( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_floats to see working of +/* loop through the $not_floats to see working of is_float(), is_double() & is_real() on objects, arrays, boolean and others */ $loop_counter = 1; @@ -135,7 +135,7 @@ var_dump( is_float() ); var_dump( is_double() ); var_dump( is_real() ); -//arguments more than expected +//arguments more than expected var_dump( is_float( $floats[0], $floats[1]) ); var_dump( is_double( $floats[0], $floats[1]) ); var_dump( is_real( $floats[0], $floats[1]) ); diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 4266a3b39c..d154b30748 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -7,11 +7,11 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype: bool is_int ( mixed $var ); - * Description: Finds whether the given variable is an integer + * Description: Finds whether the given variable is an integer */ echo "*** Testing is_int(), is_integer() & is_long() with valid integer values ***\n"; -// different valid integer values +// different valid integer values $valid_ints = array( 0, 1, @@ -32,7 +32,7 @@ $valid_ints = array( -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); -/* loop to check that is_int() recognizes different +/* loop to check that is_int() recognizes different integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { @@ -52,15 +52,15 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// other types in a array +// other types in a array $not_int_types = array ( /* float values */ -2147483649, // float value 2147483648, // float value -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int - 020000000001, // float value, beyond max positive int - -020000000001, // float value, beyond max negative int + 020000000001, // float value, beyond max positive int + -020000000001, // float value, beyond max negative int 0.0, -0.1, 1.0, @@ -119,10 +119,10 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { @@ -138,7 +138,7 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index 883debbfd8..68ef75b35b 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -9,11 +9,11 @@ precision=14 --FILE-- <?php /* Prototype: bool is_int ( mixed $var ); - * Description: Finds whether the given variable is an integer + * Description: Finds whether the given variable is an integer */ echo "*** Testing is_int(), is_integer() & is_long() with valid integer values ***\n"; -// different valid integer values +// different valid integer values $valid_ints = array( 0, 1, @@ -34,7 +34,7 @@ $valid_ints = array( -020000000000, // max negative integer as octal 017777777777, // max positive integer as octal ); -/* loop to check that is_int() recognizes different +/* loop to check that is_int() recognizes different integer values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_ints as $int_val ) { @@ -54,15 +54,15 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// other types in a array +// other types in a array $not_int_types = array ( /* float values */ -2147483649, // float value 2147483648, // float value -0x80000001, // float value, beyond max negative int 0x800000001, // float value, beyond max positive int - 020000000001, // float value, beyond max positive int - -020000000001, // float value, beyond max negative int + 020000000001, // float value, beyond max positive int + -020000000001, // float value, beyond max negative int 0.0, -0.1, 1.0, @@ -121,10 +121,10 @@ $not_int_types = array ( FALSE, /* undefined and unset vars */ - @$unset_var, + @$unset_var, @$undefined_var ); -/* loop through the $not_int_types to see working of +/* loop through the $not_int_types to see working of is_int() on non integer types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_int_types as $type ) { @@ -140,7 +140,7 @@ var_dump( is_int() ); var_dump( is_integer() ); var_dump( is_long() ); -//arguments more than expected +//arguments more than expected var_dump( is_int(TRUE, FALSE) ); var_dump( is_integer(TRUE, FALSE) ); var_dump( is_long(TRUE, FALSE) ); diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt index dace39ca10..fa7c87f791 100644 --- a/ext/standard/tests/general_functions/is_null.phpt +++ b/ext/standard/tests/general_functions/is_null.phpt @@ -3,11 +3,11 @@ Test is_null() function --FILE-- <?php /* Prototype: bool is_null ( mixed $var ); - * Description: Finds whether the given variable is NULL + * Description: Finds whether the given variable is NULL */ echo "*** Testing is_null() with valid null values ***\n"; -// different valid null values +// different valid null values $unset_array = array(); $unset_int = 10; $unset_float = 10.5; @@ -32,7 +32,7 @@ $valid_nulls = array( @$unset_resource, @$undefined_var, ); -/* loop to check that is_null() recognizes different +/* loop to check that is_null() recognizes different null values, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_nulls as $null_val ) { @@ -46,7 +46,7 @@ echo "\n*** Testing is_bool() on non null values ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// other types in a array +// other types in a array $not_null_types = array ( /* integers */ 0, @@ -119,7 +119,7 @@ $not_null_types = array ( array(1,2,3,4), array(1 => "One", "two" => 2), ); -/* loop through the $not_null_types to see working of +/* loop through the $not_null_types to see working of is_null() on non null types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_null_types as $type ) { @@ -131,7 +131,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_null() ); -//arguments more than expected +//arguments more than expected var_dump( is_null(NULL, null) ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt index b88f1ec24a..0019cf18d2 100644 --- a/ext/standard/tests/general_functions/is_numeric.phpt +++ b/ext/standard/tests/general_functions/is_numeric.phpt @@ -3,11 +3,11 @@ Test is_numeric() function --FILE-- <?php /* Prototype: bool is_numeric ( mixed $var ); - * Description: Finds whether a variable is a number or a numeric string + * Description: Finds whether a variable is a number or a numeric string */ echo "*** Testing is_numeric() with valid numeric values ***\n"; -// different valid numeric values +// different valid numeric values $numerics = array( 0, 1, @@ -87,7 +87,7 @@ $numerics = array( '-0123', '+0123' ); -/* loop to check that is_numeric() recognizes different +/* loop to check that is_numeric() recognizes different numeric values, expected output: bool(true) */ $loop_counter = 1; foreach ($numerics as $num ) { @@ -105,7 +105,7 @@ $dfp = opendir ( dirname(__FILE__) ); $unset_var = 10.5; unset ($unset_var); -// other types in a array +// other types in a array $not_numerics = array( "0x80001", "-0x80001", @@ -137,7 +137,7 @@ $not_numerics = array( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_numerics to see working of +/* loop through the $not_numerics to see working of is_numeric() on non numeric values, expected output: bool(false) */ $loop_counter = 1; foreach ($not_numerics as $type ) { @@ -149,7 +149,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_numeric() ); -//arguments more than expected +//arguments more than expected var_dump( is_numeric("10", "20") ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt index 0060f5e526..8abc766376 100644 --- a/ext/standard/tests/general_functions/is_object.phpt +++ b/ext/standard/tests/general_functions/is_object.phpt @@ -3,7 +3,7 @@ Test is_object() function --FILE-- <?php /* Prototype: bool is_object ( mixed $var ); - * Description: Finds whether the given variable is an object + * Description: Finds whether the given variable is an object */ echo "*** Testing is_object() with valid objects ***\n"; @@ -11,7 +11,7 @@ echo "*** Testing is_object() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -31,7 +31,7 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface IValue { public function setVal ($name, $val); @@ -52,8 +52,8 @@ class Value implements IValue } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -90,7 +90,7 @@ $valid_objects = array( $concreteClass_object ); -/* loop to check that is_object() recognizes different +/* loop to check that is_object() recognizes different objects, expected output: bool(true) */ $loop_counter = 1; foreach ($valid_objects as $object ) { @@ -104,11 +104,11 @@ echo "\n*** Testing is_object() on non object types ***\n"; $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); -// unset object +// unset object $unset_object = new foo(); unset ($unset_object); -// other types in a array +// other types in a array $not_objects = array ( 0, -1, @@ -130,7 +130,7 @@ $not_objects = array ( @$unset_object, // unset object @$undefined_var, // undefined variable ); -/* loop through the $not_objects to see working of +/* loop through the $not_objects to see working of is_object() on non object types, expected output: bool(false) */ $loop_counter = 1; foreach ($not_objects as $type ) { @@ -142,7 +142,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_object() ); -//arguments more than expected +//arguments more than expected var_dump( is_object($myClass_object, $myClass_object) ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt index 5ff4d2d59d..75f4e4a8d8 100644 --- a/ext/standard/tests/general_functions/is_resource_basic.phpt +++ b/ext/standard/tests/general_functions/is_resource_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_resource() function : basic functionality +Test is_resource() function : basic functionality --FILE-- <?php /* Prototype : bool is_resource ( mixed $var ) diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt index acb3cb660b..f7168737cd 100644 --- a/ext/standard/tests/general_functions/is_resource_error.phpt +++ b/ext/standard/tests/general_functions/is_resource_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_resource() function : error conditions +Test is_resource() function : error conditions --FILE-- <?php /* Prototype : bool is_resource ( mixed $var ) diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt index a7adf6d8e5..53620178c4 100644 --- a/ext/standard/tests/general_functions/is_scalar.phpt +++ b/ext/standard/tests/general_functions/is_scalar.phpt @@ -13,7 +13,7 @@ $scalar_variables = array( -45678, 0x5FF, // hexadecimal as integer 0X566, - -0xAAF, + -0xAAF, -0XCCF, 01234, // octal as integer -0126, @@ -34,7 +34,7 @@ $scalar_variables = array( ' ', "string", 'string', - "0", // numeric as string + "0", // numeric as string "40", "50.696", "0x534", @@ -45,7 +45,7 @@ $scalar_variables = array( true, false ); -/* loop through each valid scalar variables in $scalar_variables +/* loop through each valid scalar variables in $scalar_variables and see the working of is_scalar(), expected output: bool(true) */ $loop_counter = 1; @@ -65,7 +65,7 @@ $array = array(10); $resource = opendir('.'); unset($int_var, $float_var, $string_var, $boolean_var, $object, $array, $resource); -// resources +// resources $fp = fopen(__FILE__, "r"); $dfp = opendir("."); @@ -73,7 +73,7 @@ $variation_array = array( NULL, null, - array(), // arrays + array(), // arrays array(NULL), array(true), array(0), @@ -96,7 +96,7 @@ $variation_array = array( @$undefined_var // undefined variable ); -/* loop through each element of $variation_array to see the +/* loop through each element of $variation_array to see the working of is_scalar on non-scalar values, expected output: bool(false) */ $loop_counter = 1; diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt index 685ac6fb14..72a885a57a 100644 --- a/ext/standard/tests/general_functions/is_string.phpt +++ b/ext/standard/tests/general_functions/is_string.phpt @@ -7,7 +7,7 @@ Test is_string() function */ echo "*** Testing is_string() with valid string values ***\n"; -// different valid strings +// different valid strings /* string created using Heredoc (<<<) */ $heredoc_string = <<<EOT @@ -50,7 +50,7 @@ $strings = array( $heredoc_empty_string, $heredoc_null_string ); -/* loop to check that is_string() recognizes different +/* loop to check that is_string() recognizes different strings, expected output bool(true) */ $loop_counter = 1; foreach ($strings as $string ) { @@ -70,10 +70,10 @@ $unset_string2 = 'string'; $unset_heredoc = <<<EOT this is heredoc string EOT; -// unset the vars +// unset the vars unset($unset_string1, $unset_string2, $unset_heredoc); -// other types in a array +// other types in a array $not_strings = array ( /* integers */ 0, @@ -130,9 +130,9 @@ $not_strings = array ( @$unset_string1, @$unset_string2, @$unset_heredoc, - @$undefined_var + @$undefined_var ); -/* loop through the $not_strings to see working of +/* loop through the $not_strings to see working of is_string() on non string types, expected output bool(false) */ $loop_counter = 1; foreach ($not_strings as $type ) { @@ -144,7 +144,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( is_string() ); -//arguments more than expected +//arguments more than expected var_dump( is_string("string", "test") ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt index 7731097799..fd3f5be6a0 100644 --- a/ext/standard/tests/general_functions/isset_basic1.phpt +++ b/ext/standard/tests/general_functions/isset_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test isset() function : basic functionality +Test isset() function : basic functionality --FILE-- <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt index bf121ed6dc..5f0432b594 100644 --- a/ext/standard/tests/general_functions/isset_basic2.phpt +++ b/ext/standard/tests/general_functions/isset_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test isset() function : basic functionality +Test isset() function : basic functionality --FILE-- <?php /* Prototype : bool isset ( mixed $var [, mixed $var [, $... ]] ) diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt index 9c76af97bd..1c62340970 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ob_get_flush() function : basic functionality +Test ob_get_flush() function : basic functionality --INI-- output_buffering=0 --FILE-- <?php /* Prototype : bool ob_get_flush(void) - * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer + * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index 3d3b47d615..0664043eba 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ob_get_flush() function : error conditions +Test ob_get_flush() function : error conditions --INI-- output_buffering=0 --FILE-- <?php /* Prototype : bool ob_get_flush(void) - * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer + * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt index 5fdc71d67c..b3470bec55 100644 --- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt +++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ob_get_length() function : basic functionality +Test ob_get_length() function : basic functionality --INI-- output_buffering=0 --FILE-- <?php /* Prototype : int ob_get_length(void) - * Description: Return the length of the output buffer + * Description: Return the length of the output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index c3939a2246..1621fe9f16 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -4,7 +4,7 @@ Test parse_ini_string() function <?php /* Prototype: array parse_ini_string(string $string [,bool $process_sections]); Description: parse_ini_string() loads in the ini file specified in filename, - and returns the settings in it in an associative array. + and returns the settings in it in an associative array. */ $parse_string = <<<EOD diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index 0cc8e609b1..fe02a97c18 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -24,9 +24,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -80,7 +80,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -255,9 +255,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 8809a1b808..25776dd3ba 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -29,9 +29,9 @@ function check_printr( $variables ) { $counter++; } } - + echo "\n*** Testing print_r() on integer variables ***\n"; -$integers = array ( +$integers = array ( 0, // zero as argument 000000123, //octal value of 83 123000000, @@ -85,7 +85,7 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); /* calling check_printr() to display contents of float variables using print_r() */ @@ -260,9 +260,9 @@ $variations = array ( array( new no_member_class, array(), false, 0 ), array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ), array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ), //unusual data - array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') + array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') ); -/* calling check_printr() to display combinations of scalar and +/* calling check_printr() to display combinations of scalar and non-scalar variables using print_r() */ check_printr($variations); diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt index 539eea202e..87a4545501 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -45,7 +45,7 @@ function get_priority_from_wmic() { $f = false; $m = [ - strpos($t[0], ' ProcessId' ), + strpos($t[0], ' ProcessId' ), strpos($t[0], ' Priority ') ]; @@ -71,10 +71,10 @@ function get_priority_from_wmic() { $p = [ /* '<verbose name>' => ['<wmic value>', '<proc_nice value>'] */ - 'Idle' => [4, 10], - 'Below normal' => [6, 5], - 'Normal' => [8, 0], - 'Above normal' => [10, -5], + 'Idle' => [4, 10], + 'Below normal' => [6, 5], + 'Normal' => [8, 0], + 'Above normal' => [10, -5], 'High priority' => [13, -10] ]; diff --git a/ext/standard/tests/general_functions/proc_open_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt index dc104283eb..f3335bc8ce 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes1.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes1.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with > 16 pipes +proc_open() with > 16 pipes --FILE-- <?php diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index bc8f29b6fe..21734773a3 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with no pipes +proc_open() with no pipes --FILE-- <?php diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt index 6e90471bdc..d64987018b 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt @@ -1,5 +1,5 @@ --TEST-- -proc_open() with invalid pipes +proc_open() with invalid pipes --FILE-- <?php diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index 08ac2f1d01..69c455d076 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -35,7 +35,7 @@ var_dump(putenv('FOO=°¡a°¡°¡°¡°¡'), getenv("FOO")); ?> ===DONE=== ---EXPECT-- +--EXPECT-- bool(true) string(2) "°¡" bool(true) diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt index 2c5f5ab3e6..0ef0e7c213 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sleep() function : basic functionality +Test sleep() function : basic functionality --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); @@ -7,7 +7,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php /* Prototype : int sleep ( int $seconds ) - * Description: Delays the program execution for the given number of seconds . + * Description: Delays the program execution for the given number of seconds . * Source code: ext/standard/basic_functions.c */ @@ -22,7 +22,7 @@ $time_start = microtime(true); // Sleep for a while sleep($sleeptime); -// Test passes if sleeps for at least 98% of specified time +// Test passes if sleeps for at least 98% of specified time $sleeplow = $sleeptime - ($sleeptime * 2 /100); $time_end = microtime(true); diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt index 2e75837701..c4f069a3d2 100644 --- a/ext/standard/tests/general_functions/sleep_error.phpt +++ b/ext/standard/tests/general_functions/sleep_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sleep() function : error conditions +Test sleep() function : error conditions --FILE-- <?php /* Prototype : int sleep ( int $seconds ) - * Description: Delays the program execution for the given number of seconds . + * Description: Delays the program execution for the given number of seconds . * Source code: ext/standard/basic_functions.c */ set_time_limit(20); diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index d72ac7a2ab..b814733dd0 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -26,7 +26,7 @@ $heredoc_NULL_string = <<<EOD NULL EOD; -// different valid scalar values +// different valid scalar values $scalars = array( /* integers */ 0, @@ -91,11 +91,11 @@ $scalars = array( "true", /*"\0123", "\0x12FF",*/ - $heredoc_string, + $heredoc_string, $heredoc_numeric_string, $heredoc_empty_string ); -/* loop to check that strval() recognizes different +/* loop to check that strval() recognizes different scalar values and returns the string conversion of same */ $loop_counter = 1; foreach ($scalars as $scalar ) { @@ -112,7 +112,7 @@ $dfp = opendir( dirname(__FILE__) ); $unset_var = 10; unset ($unset_var); -// non_scalar values, objects, arrays, resources and boolean +// non_scalar values, objects, arrays, resources and boolean class foo { function __toString() { @@ -133,7 +133,7 @@ $not_scalars = array ( @$unset_var, // unset variable @$undefined_var ); -/* loop through the $not_scalars to see working of +/* loop through the $not_scalars to see working of strval() on objects, arrays, boolean and others */ $loop_counter = 1; foreach ($not_scalars as $value ) { @@ -145,7 +145,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_dump( strval() ); -//arguments more than expected +//arguments more than expected var_dump( strval( $scalars[0], $scalars[1]) ); echo "Done\n"; diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt index 109fe00328..285365ab60 100644 --- a/ext/standard/tests/general_functions/uniqid_basic.phpt +++ b/ext/standard/tests/general_functions/uniqid_basic.phpt @@ -3,7 +3,7 @@ Test uniqid() function : basic functionality --FILE-- <?php /* Prototype : string uniqid ([ string $prefix= "" [, bool $more_entropy= false ]] ) - * Description: Gets a prefixed unique identifier based on the current time in microseconds. + * Description: Gets a prefixed unique identifier based on the current time in microseconds. * Source code: ext/standard/uniqid.c */ echo "*** Testing uniqid() : basic functionality ***\n"; @@ -16,14 +16,14 @@ echo "\n\n"; echo "uniqid() with a prefix\n"; -// Use a fixed prefix so we can ensure length of o/p id is fixed +// Use a fixed prefix so we can ensure length of o/p id is fixed $prefix = array ( 99999, "99999", 10.5e2, null, true, - false + false ); for ($i = 0; $i < count($prefix); $i++) { diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt index b358edc48c..388bc42599 100644 --- a/ext/standard/tests/general_functions/uniqid_error.phpt +++ b/ext/standard/tests/general_functions/uniqid_error.phpt @@ -3,7 +3,7 @@ Test uniqid() function : error conditions --FILE-- <?php /* Prototype : string uniqid ([ string $prefix= "" [, bool $more_entropy= false ]] ) - * Description: Gets a prefixed unique identifier based on the current time in microseconds. + * Description: Gets a prefixed unique identifier based on the current time in microseconds. * Source code: ext/standard/uniqid.c */ echo "*** Testing uniqid() : error conditions ***\n"; diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index a4b31c6524..17822376ad 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -7,7 +7,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php /* Prototype : void usleep ( int $micro_seconds ) - * Description: Delays program execution for the given number of micro seconds. + * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ @@ -16,7 +16,7 @@ set_time_limit(20); echo "*** Testing usleep() : basic functionality ***\n"; $sleeptime = 1000000; // == 1 seconds -// Test passes if sleeps for at least 98% of specified time +// Test passes if sleeps for at least 98% of specified time $sleeplow = $sleeptime - ($sleeptime * 2 /100); $time_start = microtime(true); diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt index 93aa9824e3..474aab7d5d 100644 --- a/ext/standard/tests/general_functions/usleep_error.phpt +++ b/ext/standard/tests/general_functions/usleep_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test usleep() function : error conditions +Test usleep() function : error conditions --FILE-- <?php /* Prototype : void usleep ( int $micro_seconds ) - * Description: Delays program execution for the given number of micro seconds. + * Description: Delays program execution for the given number of micro seconds. * Source code: ext/standard/basic_functions.c */ diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index bccbd23910..b12f5f579f 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -41,7 +41,7 @@ $integers = array ( 017777777777, // max posotive octal integer -020000000000 // min range of octal integer ); -/* calling check_vardump() to display contents of integer variables +/* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -78,9 +78,9 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); -/* calling check_vardump() to display contents of float variables +/* calling check_vardump() to display contents of float variables using var_dump() */ check_vardump($floats); @@ -101,7 +101,7 @@ $strings = array ( "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL "1234\t\n5678\n\t9100\rabcda" // strings with escape characters ); -/* calling check_vardump() to display contents of strings +/* calling check_vardump() to display contents of strings using var_dump() */ check_vardump($strings); @@ -271,7 +271,7 @@ $misc_values = array ( check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; -var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, +var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, $objects, $misc_values, $variations ); /* checking var_dump() on functions */ diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index f9ed8dab2e..a7f61ec063 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -41,7 +41,7 @@ $integers = array ( 017777777777, // max posotive octal integer -020000000000 // min range of octal integer ); -/* calling check_vardump() to display contents of integer variables +/* calling check_vardump() to display contents of integer variables using var_dump() */ check_vardump($integers); @@ -78,9 +78,9 @@ $floats = array ( -0x80000001, // float value, beyond max negative int 0x80000001, // float value, beyond max positive int 020000000001, // float value, beyond max positive int - -020000000001 // float value, beyond max negative int + -020000000001 // float value, beyond max negative int ); -/* calling check_vardump() to display contents of float variables +/* calling check_vardump() to display contents of float variables using var_dump() */ check_vardump($floats); @@ -101,7 +101,7 @@ $strings = array ( "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL "1234\t\n5678\n\t9100\rabcda" // strings with escape characters ); -/* calling check_vardump() to display contents of strings +/* calling check_vardump() to display contents of strings using var_dump() */ check_vardump($strings); @@ -271,7 +271,7 @@ $misc_values = array ( check_vardump($misc_values); echo "\n*** Testing var_dump() on multiple arguments ***\n"; -var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, +var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, $objects, $misc_values, $variations ); /* checking var_dump() on functions */ diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index 10fb889858..e8939f1d0a 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -17,7 +17,7 @@ setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","d */ echo "*** Testing var_export() with integer values ***\n"; -// different integer values +// different integer values $valid_ints = array( '0', '1', @@ -53,7 +53,7 @@ $counter++; } echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean values +// different valid boolean values $valid_bool = array( 1, TRUE, @@ -77,7 +77,7 @@ $counter++; } echo "*** Testing var_export() with valid float values ***\n"; -// different valid float values +// different valid float values $valid_floats = array( (float)-2147483649, // float value (float)2147483648, // float value @@ -115,7 +115,7 @@ $counter++; } echo "*** Testing var_export() with valid strings ***\n"; -// different valid string +// different valid string $valid_strings = array( "", " ", @@ -148,7 +148,7 @@ $counter++; } echo "*** Testing var_export() with valid arrays ***\n"; -// different valid arrays +// different valid arrays $valid_arrays = array( array(), array(NULL), @@ -185,7 +185,7 @@ echo "*** Testing var_export() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -204,7 +204,7 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface iValue { public function setVal ($name, $val); @@ -224,8 +224,8 @@ class Value implements iValue } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; @@ -276,7 +276,7 @@ $counter++; } echo "*** Testing var_export() with valid null values ***\n"; -// different valid null values +// different valid null values $unset_var = array(); unset ($unset_var); // now a null $null_var = NULL; @@ -304,7 +304,7 @@ echo "\n*** Testing error conditions ***\n"; //Zero argument var_export( var_export() ); -//arguments more than expected +//arguments more than expected var_export( var_export(TRUE, FALSE, TRUE) ); echo "\n\nDone"; diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index 9dbc821271..bee1843989 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -3,13 +3,13 @@ Test var_export() function with integer values --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with integer values ***\n"; -// different integer values +// different integer values $valid_ints = array( '0' => '0', '1' => '1', diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 300b5287c8..6dfb08f082 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -4,13 +4,13 @@ Test var_export() function with valid boolean values <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean values +// different valid boolean values $valid_bool = array( "1" => 1, "TRUE" => TRUE, diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index f31334e69e..b66d2c4584 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -5,13 +5,13 @@ serialize_precision=17 --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with valid float values ***\n"; -// different valid float values +// different valid float values $valid_floats = array( "-2147483649" => (float)-2147483649, // float value "2147483648" => (float)2147483648, // float value diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt index 9b6e42c71e..cfdac8b268 100644 --- a/ext/standard/tests/general_functions/var_export_basic4.phpt +++ b/ext/standard/tests/general_functions/var_export_basic4.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid strings --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with valid strings ***\n"; -// different valid string +// different valid string $valid_strings = array( "\"\"" => "", "\" \"" => " ", diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt index 3e0e50f21c..ab81fa802e 100644 --- a/ext/standard/tests/general_functions/var_export_basic5.phpt +++ b/ext/standard/tests/general_functions/var_export_basic5.phpt @@ -5,14 +5,14 @@ serialize_precision=17 --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with valid arrays ***\n"; -// different valid arrays +// different valid arrays $valid_arrays = array( "array()" => array(), "array(NULL)" => array(NULL), diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index a24b44b949..6eff478d70 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -3,7 +3,7 @@ Test var_export() function with valid objects --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ @@ -13,7 +13,7 @@ echo "*** Testing var_export() with valid objects ***\n"; // class with no members class foo { -// no members +// no members } // abstract class @@ -32,7 +32,7 @@ class concreteClass extends abstractClass } } -// interface class +// interface class interface iValue { public function setVal ($name, $val); @@ -52,8 +52,8 @@ class Value implements iValue } } -// a gereral class -class myClass +// a gereral class +class myClass { var $foo_object; public $public_var; diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt index 02668237c9..817ffc91f0 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -3,14 +3,14 @@ Test var_export() function with valid null values --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ echo "*** Testing var_export() with valid null values ***\n"; -// different valid null values +// different valid null values $unset_var = array(); unset ($unset_var); // now a null $null_var = NULL; diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt index 3fe0a23d3a..a52bf430d2 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -3,7 +3,7 @@ var_export(): simple test with arrays and objects --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/var_export_error1.phpt b/ext/standard/tests/general_functions/var_export_error1.phpt index de66874c25..ffa542c053 100644 --- a/ext/standard/tests/general_functions/var_export_error1.phpt +++ b/ext/standard/tests/general_functions/var_export_error1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test var_export() function : error conditions +Test var_export() function : error conditions --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 9ad5803fbe..57764e54d1 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -3,7 +3,7 @@ Test var_export() function : error conditions - recursive object --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index 284460d242..a5acb37027 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -3,7 +3,7 @@ Test var_export() function : error conditions - recursive array --FILE-- <?php /* Prototype : mixed var_export(mixed var [, bool return]) - * Description: Outputs or returns a string representation of a variable + * Description: Outputs or returns a string representation of a variable * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index f911ef33d2..e4403a7120 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : basic functionality --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt index 9544a2acf1..d72535c91c 100644 --- a/ext/standard/tests/image/getimagesize_error1.phpt +++ b/ext/standard/tests/image/getimagesize_error1.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index d171365baf..000cef0555 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : basic functionality - load APP info from jpeg. --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt index a5f5bb8cc3..99c6e7c63b 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -3,7 +3,7 @@ GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_variation1.phpt b/ext/standard/tests/image/getimagesize_variation1.phpt index 23f2b15745..09679f53c7 100644 --- a/ext/standard/tests/image/getimagesize_variation1.phpt +++ b/ext/standard/tests/image/getimagesize_variation1.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 1 --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 8288e28bf9..c6bcf32e25 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 2 --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index 9db2b5eadb..26d871150b 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 8c37da7665..f8ba898d7d 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : variation - For shockwave-flash format --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_variation_003.phpt b/ext/standard/tests/image/getimagesize_variation_003.phpt index 1de9850651..e46b9e97b4 100644 --- a/ext/standard/tests/image/getimagesize_variation_003.phpt +++ b/ext/standard/tests/image/getimagesize_variation_003.phpt @@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index f5f2b83da2..ea7b813d77 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : basic functionality for shockwave-flash --FILE-- <?php /* Prototype : array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt index 2410cff4d5..e09eab40af 100644 --- a/ext/standard/tests/image/getimagesize_wbmp.phpt +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt @@ -3,7 +3,7 @@ GetImageSize() for wbmp format --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt index 360394ae3c..635750c51c 100644 --- a/ext/standard/tests/image/getimagesize_xbm.phpt +++ b/ext/standard/tests/image/getimagesize_xbm.phpt @@ -3,7 +3,7 @@ GetImageSize() for xbm format --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) - * Description: Get the size of an image as 4-element array + * Description: Get the size of an image as 4-element array * Source code: ext/standard/image.c * Alias to functions: */ diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt index 74f27a877b..40b5a07725 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt @@ -12,20 +12,20 @@ image_type_to_mime_type() echo "Starting image_type_to_mime_type() test\n\n"; $image_types = array ( - IMAGETYPE_GIF, - IMAGETYPE_JPEG, - IMAGETYPE_PNG, - IMAGETYPE_SWF, - IMAGETYPE_PSD, - IMAGETYPE_BMP, - IMAGETYPE_TIFF_II, - IMAGETYPE_TIFF_MM, - IMAGETYPE_JPC, + IMAGETYPE_GIF, + IMAGETYPE_JPEG, + IMAGETYPE_PNG, + IMAGETYPE_SWF, + IMAGETYPE_PSD, + IMAGETYPE_BMP, + IMAGETYPE_TIFF_II, + IMAGETYPE_TIFF_MM, + IMAGETYPE_JPC, IMAGETYPE_JP2, - IMAGETYPE_JPX, + IMAGETYPE_JPX, IMAGETYPE_JB2, - IMAGETYPE_IFF, - IMAGETYPE_WBMP, + IMAGETYPE_IFF, + IMAGETYPE_WBMP, IMAGETYPE_JPEG2000, IMAGETYPE_XBM, IMAGETYPE_WEBP diff --git a/ext/standard/tests/image/image_type_to_mime_type_error.phpt b/ext/standard/tests/image/image_type_to_mime_type_error.phpt index 88aacbf176..9a3e2d17c5 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_error.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_error.phpt @@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : error conditions - Pass incorrect num --FILE-- <?php /* Prototype : proto string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt index 2c67338e41..d6276cf559 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt @@ -5,7 +5,7 @@ Test image_type_to_mime_type() function : usage variations - Pass different dat --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt index 11306bc19d..6043c81180 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt @@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : usage variations - Pass decimal, octa --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt index 1b4f418cdb..d8366c15e3 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt @@ -5,7 +5,7 @@ Sanjay Mantoor <sanjay.mantoor@gmail.com> --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt index 0a96338736..8ec2e37ae1 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt @@ -9,7 +9,7 @@ Test image_type_to_mime_type() function : usage variations - Passing IMAGETYPE_I --FILE-- <?php /* Prototype : string image_type_to_mime_type(int imagetype) - * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype + * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype * Source code: ext/standard/image.c */ diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt index e6cef90fae..f0a5d5ea85 100644 --- a/ext/standard/tests/mail/bug66535.phpt +++ b/ext/standard/tests/mail/bug66535.phpt @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt index 78fa49fe42..98ece49769 100644 --- a/ext/standard/tests/mail/bug69115.phpt +++ b/ext/standard/tests/mail/bug69115.phpt @@ -3,7 +3,7 @@ Bug #69115 crash in mail (plus indirect pcre test) --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) !== 'WIN') die('skip Windows only test, as in Unix builds it sends an email'); ?> --INI-- -SMTP = +SMTP = smtp_port = --FILE-- <?php diff --git a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt index 46abdba7c8..44a06651ad 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ezmlm_hash() function : basic functionality +Test ezmlm_hash() function : basic functionality --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt index b0c95f35d1..ddc5571c7e 100644 --- a/ext/standard/tests/mail/mail_basic.phpt +++ b/ext/standard/tests/mail/mail_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path=tee mailBasic.out >/dev/null mail.add_x_header = Off @@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt index 24bf2f92f1..aa1e0b1ecd 100644 --- a/ext/standard/tests/mail/mail_basic2.phpt +++ b/ext/standard/tests/mail/mail_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -11,7 +11,7 @@ mail.add_x_header = Off --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt index 70142cee1f..3bab805649 100644 --- a/ext/standard/tests/mail/mail_basic3.phpt +++ b/ext/standard/tests/mail/mail_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt index 9b11ad00c5..c7f8ff9824 100644 --- a/ext/standard/tests/mail/mail_basic4.phpt +++ b/ext/standard/tests/mail/mail_basic4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt index 591d48ac53..c6cc005dd5 100644 --- a/ext/standard/tests/mail/mail_basic5.phpt +++ b/ext/standard/tests/mail/mail_basic5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --INI-- sendmail_path="exit 1" --SKIPIF-- @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index 815eca28c6..eb4c47271f 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php @@ -14,7 +14,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -52,7 +52,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt index 13e75a6c2a..dedb1e3ff8 100644 --- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -50,7 +50,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt index d768fc9be5..5d1ec6b7a3 100644 --- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -50,7 +50,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt index ec51737cee..c90e909c6f 100644 --- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -51,7 +51,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_error.phpt b/ext/standard/tests/mail/mail_error.phpt index e71fafbd13..efecd162e9 100644 --- a/ext/standard/tests/mail/mail_error.phpt +++ b/ext/standard/tests/mail/mail_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test mail() function : error conditions +Test mail() function : error conditions --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt index d520cdc254..fd40f97b68 100644 --- a/ext/standard/tests/mail/mail_variation1.phpt +++ b/ext/standard/tests/mail/mail_variation1.phpt @@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt index 49ede34eee..7e78bcfade 100644 --- a/ext/standard/tests/mail/mail_variation2.phpt +++ b/ext/standard/tests/mail/mail_variation2.phpt @@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt index 58ebda047d..258bf31377 100644 --- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -51,7 +51,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt index 5462c85c24..4c8ee2ff6c 100644 --- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -51,7 +51,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt index 8a569c0c32..ae6e308715 100644 --- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt +++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mail() function : basic functionality +Test mail() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) != 'WIN' ) { @@ -13,7 +13,7 @@ max_execution_time = 120 --FILE-- <?php /* Prototype : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]]) - * Description: Send an email message + * Description: Send an email message * Source code: ext/standard/mail.c * Alias to functions: */ @@ -50,7 +50,7 @@ if ($imap_stream === false) { } $found = false; -$repeat_count = 20; // we will repeat a max of 20 times +$repeat_count = 20; // we will repeat a max of 20 times while (!$found && $repeat_count > 0) { // sleep for a while to allow msg to be delivered diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 881feb96d9..153aa80fe8 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test abs() function : basic functionality +Test abs() function : basic functionality --INI-- precision = 14 --FILE-- @@ -20,8 +20,8 @@ $values = array(23, "23", "-23", "23.45", - "2.345e1", - "-2.345e1", + "2.345e1", + "-2.345e1", null, true, false); diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt index 532ba94c96..5575ec5796 100644 --- a/ext/standard/tests/math/acos_variation.phpt +++ b/ext/standard/tests/math/acos_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt index c011f4aa1b..cc89ce3e76 100644 --- a/ext/standard/tests/math/acosh_variation.phpt +++ b/ext/standard/tests/math/acosh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt index bd2321e9c8..c8063849fd 100644 --- a/ext/standard/tests/math/asin_variation.phpt +++ b/ext/standard/tests/math/asin_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt index d8fd1828c9..5e41a45900 100644 --- a/ext/standard/tests/math/asinh_variation.phpt +++ b/ext/standard/tests/math/asinh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index f0055e4fdb..f6dae62900 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -12,7 +12,7 @@ $valuesy = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, false); @@ -25,7 +25,7 @@ $valuesx = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, false); diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt index ab8cf72a8d..7f9be489e7 100644 --- a/ext/standard/tests/math/atan2_variation1.phpt +++ b/ext/standard/tests/math/atan2_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt index 9d61a09972..120ac45eb5 100644 --- a/ext/standard/tests/math/atan2_variation2.phpt +++ b/ext/standard/tests/math/atan2_variation2.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt index 81174e0322..b6a9a9ec32 100644 --- a/ext/standard/tests/math/atan_variation.phpt +++ b/ext/standard/tests/math/atan_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt index 0dbbba851f..2b0a4b1085 100644 --- a/ext/standard/tests/math/atanh_variation.phpt +++ b/ext/standard/tests/math/atanh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 1643bf153f..9591411db3 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -9,7 +9,7 @@ $values = array(10, 27, 39, 03, - 0x5F, + 0x5F, "10", "27", "39", diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 24a91bc0c0..cf7c50a09e 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -23,7 +23,7 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, null); diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index 79ae0a56d6..0a8bb0587d 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -23,7 +23,7 @@ $values = array(111000111, 31101.3, 31.1013e5, 0x111ABC, - 011237, + 011237, true, false, null); diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt index 5a556b7d2b..488ab538ed 100644 --- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt @@ -13,13 +13,13 @@ define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $binLongStrs = array( - '0'.str_repeat('1',63), - str_repeat('1',64), - '0'.str_repeat('1',31), - str_repeat('1',32), + '0'.str_repeat('1',63), + str_repeat('1',64), + '0'.str_repeat('1',31), + str_repeat('1',32), '0'.str_repeat('1',64), - str_repeat('1',65), - '0'.str_repeat('1',32), + str_repeat('1',65), + '0'.str_repeat('1',32), str_repeat('1',33) ); diff --git a/ext/standard/tests/math/bug45712.phpt b/ext/standard/tests/math/bug45712.phpt index 2aa4386587..23c3b6ddd3 100644 --- a/ext/standard/tests/math/bug45712.phpt +++ b/ext/standard/tests/math/bug45712.phpt @@ -14,7 +14,7 @@ var_dump($nan==50); var_dump($nan=='500'); var_dump($nan=='abc'); var_dump($nan==$nan); -// +// var_dump($nan===''); var_dump($nan===0.5); var_dump($nan===50); @@ -33,7 +33,7 @@ var_dump($inf==50); var_dump($inf=='500'); var_dump($inf=='abc'); var_dump($inf==$inf); -// +// var_dump($inf===''); var_dump($inf===0.5); var_dump($inf===50); diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index b71178ca19..9e06267d22 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -25,7 +25,7 @@ $values = array(0, 2.6, -2.6, 037, - 0x5F, + 0x5F, "10.5", "-10.5", "3.95E3", @@ -33,7 +33,7 @@ $values = array(0, "039", true, false, - null, + null, ); for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/constants_basic.phpt b/ext/standard/tests/math/constants_basic.phpt index 0220d93355..f44c6de4ff 100644 --- a/ext/standard/tests/math/constants_basic.phpt +++ b/ext/standard/tests/math/constants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test for pre-defined math constants +Test for pre-defined math constants --INI-- precision=14 --FILE-- diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt index ec6fb48642..6323042dc7 100644 --- a/ext/standard/tests/math/cos_variation.phpt +++ b/ext/standard/tests/math/cos_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt index f4f7e89fc1..cd64670668 100644 --- a/ext/standard/tests/math/cosh_variation.phpt +++ b/ext/standard/tests/math/cosh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 4cab650ecc..158c05b54a 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,7 +14,7 @@ $values = array(10, "0x5F", true, false, - null, + null, ); for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index 007c998e48..38279c41ce 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index 53ebbe184e..b6341cca76 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -38,7 +38,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index 92312e4053..b2209ba301 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -38,7 +38,7 @@ $inputs = array( 1, 12345, -2345, - 18446744073709551615, // largest decimal + 18446744073709551615, // largest decimal 18446744073709551616, // float data @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index 851cff44c4..9f6328c24a 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,7 +14,7 @@ $values = array(10, "0x5F", true, false, - null, + null, ); for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index 0575c7fcd5..ee51c134d5 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -38,7 +38,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index b97285ba94..404e9dfd82 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -38,7 +38,7 @@ $inputs = array( 1, 12345, -2345, - 18446744073709551615, // largest decimal + 18446744073709551615, // largest decimal 18446744073709551616, // float data @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 35d2bc5091..19bda37bff 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -6,7 +6,7 @@ $values = array(10, 3950.5, 3.9505e3, 03, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", @@ -14,7 +14,7 @@ $values = array(10, "0x5F", true, false, - null, + null, ); for ($i = 0; $i < count($values); $i++) { diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index a991bef48e..85230df2b3 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -39,7 +39,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data @@ -70,7 +70,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index bc17cbe684..14a978b2b3 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -39,7 +39,7 @@ $inputs = array( 1, 12345, -2345, - 18446744073709551615, // largest decimal + 18446744073709551615, // largest decimal 18446744073709551616, // float data @@ -70,7 +70,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt index 58131c67d3..d5f6920ea7 100644 --- a/ext/standard/tests/math/deg2rad_variation.phpt +++ b/ext/standard/tests/math/deg2rad_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 870fa285ea..973f74de0b 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -8,14 +8,14 @@ $values = array(10, 10.3, 3.9505e3, 037, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", "039", true, false, - null, + null, ); $iterator = 1; diff --git a/ext/standard/tests/math/exp_variation1.phpt b/ext/standard/tests/math/exp_variation1.phpt index 07e051b179..5305b63660 100644 --- a/ext/standard/tests/math/exp_variation1.phpt +++ b/ext/standard/tests/math/exp_variation1.phpt @@ -66,7 +66,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 8d0bb7ca02..5690f4cf6f 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ @@ -15,14 +15,14 @@ $values = array(10, 10.3, 3.9505e3, 037, - 0x5F, + 0x5F, "10", "3950.5", "3.9505e3", "039", true, false, - null, + null, ); // loop through each element of $values to check the behaviour of expm1() diff --git a/ext/standard/tests/math/expm1_error.phpt b/ext/standard/tests/math/expm1_error.phpt index 380633b67b..f743e48d18 100644 --- a/ext/standard/tests/math/expm1_error.phpt +++ b/ext/standard/tests/math/expm1_error.phpt @@ -3,7 +3,7 @@ Test expm1() - Error conditions --FILE-- <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/expm1_variation1.phpt b/ext/standard/tests/math/expm1_variation1.phpt index 8cba8b1eaf..de51bc7e75 100644 --- a/ext/standard/tests/math/expm1_variation1.phpt +++ b/ext/standard/tests/math/expm1_variation1.phpt @@ -6,7 +6,7 @@ precision=14 <?php /* Prototype : float expm1 ( float $arg ) - * Description: Returns exp(number) - 1, computed in a way that is accurate even + * Description: Returns exp(number) - 1, computed in a way that is accurate even * when the value of number is close to zero. * Source code: ext/standard/math.c */ @@ -71,7 +71,7 @@ $inputs = array( array(1,2,4), // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 5076292472..986ee26924 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -21,7 +21,7 @@ $values = array(0, 2.6, -2.6, 037, - 0x5F, + 0x5F, "10.5", "-10.5", "3.95E3", @@ -29,7 +29,7 @@ $values = array(0, "039", true, false, - null, + null, ); foreach($values as $value) { diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index afba080cf3..c851a2632c 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -12,7 +12,7 @@ $values1 = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false); @@ -25,7 +25,7 @@ $values2 = array(2, 02, "2", "2.3", - "2.3e1", + "2.3e1", null, true, false); diff --git a/ext/standard/tests/math/fmod_variation1.phpt b/ext/standard/tests/math/fmod_variation1.phpt index b10a6b9844..345d74c431 100644 --- a/ext/standard/tests/math/fmod_variation1.phpt +++ b/ext/standard/tests/math/fmod_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/fmod_variation2.phpt b/ext/standard/tests/math/fmod_variation2.phpt index fd8f1c62fa..6c5fc82541 100644 --- a/ext/standard/tests/math/fmod_variation2.phpt +++ b/ext/standard/tests/math/fmod_variation2.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index b99b2b0832..a8f2e9fcca 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -19,8 +19,8 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, null); diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index c4884742f2..aec6b76a7b 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -21,8 +21,8 @@ $values = array(0x123abc, '311015', 31101.3, 31.1013e5, - 011237, - '011237', + 011237, + '011237', true, false, null); diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt index b8bf548801..225e42018b 100644 --- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt @@ -13,13 +13,13 @@ define("MIN_64Bit", -9223372036854775807 - 1); define("MIN_32Bit", -2147483647 - 1); $hexLongStrs = array( - '7'.str_repeat('f',15), - str_repeat('f',16), - '7'.str_repeat('f',7), - str_repeat('f',8), + '7'.str_repeat('f',15), + str_repeat('f',16), + '7'.str_repeat('f',7), + str_repeat('f',8), '7'.str_repeat('f',16), str_repeat('f',18), - '7'.str_repeat('f',8), + '7'.str_repeat('f',8), str_repeat('f',9) ); diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt index c45c2aa92b..7b65e5623a 100644 --- a/ext/standard/tests/math/hexdec_error.phpt +++ b/ext/standard/tests/math/hexdec_error.phpt @@ -3,7 +3,7 @@ Test hexdec() - wrong params test hexdec() --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 1712a5750f..34b2e474d0 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ @@ -33,7 +33,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index c279addf06..f70a48eeb2 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : number hexdec ( string $hex_string ) - * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. + * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string argument. * Source code: ext/standard/math.c */ @@ -33,7 +33,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index c47aabcd8a..107d3e40de 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -20,8 +20,8 @@ $valuesy = array(23, 027, "23", "23.45", - "2.345e1", - "23abc", + "2.345e1", + "23abc", null, true, false); @@ -35,7 +35,7 @@ $valuesx = array(33, "33", "43.45", "1.345e1", - "33abc", + "33abc", null, true, false); diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt index f8491167cc..762bc58727 100644 --- a/ext/standard/tests/math/hypot_variation1.phpt +++ b/ext/standard/tests/math/hypot_variation1.phpt @@ -64,7 +64,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt index 9685ff234d..989e7d00ae 100644 --- a/ext/standard/tests/math/hypot_variation2.phpt +++ b/ext/standard/tests/math/hypot_variation2.phpt @@ -64,7 +64,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 679b702319..d0f5080619 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -10,7 +10,7 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, diff --git a/ext/standard/tests/math/is_finite_variation1.phpt b/ext/standard/tests/math/is_finite_variation1.phpt index bf4f3e41e1..498d0b2717 100644 --- a/ext/standard/tests/math/is_finite_variation1.phpt +++ b/ext/standard/tests/math/is_finite_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 2a02dfb9bb..6df5c66da6 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -10,7 +10,7 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, diff --git a/ext/standard/tests/math/is_infinite_variation1.phpt b/ext/standard/tests/math/is_infinite_variation1.phpt index d04a91b552..0f57209b98 100644 --- a/ext/standard/tests/math/is_infinite_variation1.phpt +++ b/ext/standard/tests/math/is_infinite_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index 8a37912f80..3ff65483fe 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -10,7 +10,7 @@ $values = array(234, 0352, "234", "234.5", - "23.45e1", + "23.45e1", null, true, false, diff --git a/ext/standard/tests/math/is_nan_variation1.phpt b/ext/standard/tests/math/is_nan_variation1.phpt index fed29a8901..9cd24cfd91 100644 --- a/ext/standard/tests/math/is_nan_variation1.phpt +++ b/ext/standard/tests/math/is_nan_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt index 40099689ef..5304325952 100644 --- a/ext/standard/tests/math/log10_variation.phpt +++ b/ext/standard/tests/math/log10_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index 4270ad6920..61a0c3d839 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ @@ -20,7 +20,7 @@ $values = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, false); diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt index 62549c4765..09d63be128 100644 --- a/ext/standard/tests/math/log1p_error.phpt +++ b/ext/standard/tests/math/log1p_error.phpt @@ -3,7 +3,7 @@ Test log1p() - Error conditions --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/log1p_variation1.phpt b/ext/standard/tests/math/log1p_variation1.phpt index 138471418a..b166c302eb 100644 --- a/ext/standard/tests/math/log1p_variation1.phpt +++ b/ext/standard/tests/math/log1p_variation1.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : float log1p ( float $arg ) - * Description: Returns log(1 + number), computed in a way that is accurate even + * Description: Returns log(1 + number), computed in a way that is accurate even * when the value of number is close to zero * Source code: ext/standard/math.c */ @@ -67,7 +67,7 @@ $inputs = array( $heredoc, // object data -/*24*/ new classA(), +/*24*/ new classA(), // undefined data /*25*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index a928af6013..2d0a0b4bbc 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -12,7 +12,7 @@ $values = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", null, true, false); diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt index 9d350f212c..5874f63211 100644 --- a/ext/standard/tests/math/log_variation1.phpt +++ b/ext/standard/tests/math/log_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt index 33cb38ee7b..4ea191e75c 100644 --- a/ext/standard/tests/math/log_variation2.phpt +++ b/ext/standard/tests/math/log_variation2.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 6dedc78be1..3a1e4406eb 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -8,7 +8,7 @@ echo "\nmt_rand() tests with default min and max value (i.e 0 thru ", $default_m for ($i = 0; $i < 100; $i++) { $res = mt_rand(); -// By default RAND_MAX is 32768 although no constant is defined for it for user space apps +// By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; } @@ -58,7 +58,7 @@ $min = array(true, "10", "10.5"); -// Expected numerical equivalent of above non-numerics +// Expected numerical equivalent of above non-numerics $minval = array(1, 0, 0, diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt index 545cdb0b43..d4f976b98a 100644 --- a/ext/standard/tests/math/mt_rand_variation1.phpt +++ b/ext/standard/tests/math/mt_rand_variation1.phpt @@ -63,7 +63,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt index b258dca2ad..5a5b191b1c 100644 --- a/ext/standard/tests/math/mt_rand_variation2.phpt +++ b/ext/standard/tests/math/mt_rand_variation2.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt index bb96764a16..2856446e19 100644 --- a/ext/standard/tests/math/mt_srand_variation1.phpt +++ b/ext/standard/tests/math/mt_srand_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index db1e40e831..5a2570126a 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -10,7 +10,7 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, false); diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index 90ef3ea634..b12c81c1a2 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -10,7 +10,7 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, false); diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index dfa9e9024c..7c72205639 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -19,7 +19,7 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, null); diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index a652f30623..ba613aedc5 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -22,7 +22,7 @@ $values = array(01234567, '0x1234ABC', '12345', 31101.3, - 31.1013e5, + 31.1013e5, true, false, null); diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt index 3ba10a5562..5d94acc435 100644 --- a/ext/standard/tests/math/octdec_error.phpt +++ b/ext/standard/tests/math/octdec_error.phpt @@ -3,7 +3,7 @@ Test octdec() - wrong params test octdec() --FILE-- <?php /* Prototype : number octdec ( string $octal_string ) - * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. + * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. * Source code: ext/standard/math.c */ diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt index 57edb35425..42d6a73068 100644 --- a/ext/standard/tests/math/octdec_variation1.phpt +++ b/ext/standard/tests/math/octdec_variation1.phpt @@ -5,7 +5,7 @@ precision=14 --FILE-- <?php /* Prototype : number octdec ( string $octal_string ) - * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. + * Description: Returns the decimal equivalent of the octal number represented by the octal_string argument. * Source code: ext/standard/math.c */ @@ -29,7 +29,7 @@ $inputs = array( 1, 12345, -2345, - 4294967295, // largest decimal + 4294967295, // largest decimal 4294967296, // float data diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index b4d6c8ebe9..10814ae8e8 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -6,8 +6,8 @@ precision=14 <?php echo pi(), "\n"; echo M_PI, "\n"; -// N.B pi() ignores all specified arguments no error -// messages are produced if arguments are spcified. +// N.B pi() ignores all specified arguments no error +// messages are produced if arguments are spcified. ?> --EXPECT-- 3.1415926535898 diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt index c9e13770a1..abd4f26d8e 100644 --- a/ext/standard/tests/math/pow_basic.phpt +++ b/ext/standard/tests/math/pow_basic.phpt @@ -18,7 +18,7 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, -PHP_INT_MAX - 1); diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index 1493ea5bc5..512efd034c 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -18,7 +18,7 @@ $bases = array(23, 027, "23", "23.45", - "2.345e1", + "2.345e1", PHP_INT_MAX, -PHP_INT_MAX - 1); diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index 2b98844fea..a3e13d861c 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt index 8e2497e85c..0d8b1960be 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -69,7 +69,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt index 7c4d7a0460..4876447da9 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt index d9c81143aa..596a1940a4 100644 --- a/ext/standard/tests/math/rad2deg_variation.phpt +++ b/ext/standard/tests/math/rad2deg_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt index a9fb7b399a..f59a7823b4 100644 --- a/ext/standard/tests/math/rand_basic.phpt +++ b/ext/standard/tests/math/rand_basic.phpt @@ -8,7 +8,7 @@ echo "\nrand() tests with default min and max value (i.e 0 thru ", $default_max, for ($i = 0; $i < 100; $i++) { $res = rand(); -// By default RAND_MAX is 32768 although no constant is defined for it for user space apps +// By default RAND_MAX is 32768 although no constant is defined for it for user space apps if (!is_int($res) || $res < 0 || $res > $default_max) { break; } @@ -58,7 +58,7 @@ $min = array(true, "10", "10.5"); -// Eexepcted numerical equivalent of above non-numerics +// Eexepcted numerical equivalent of above non-numerics $minval = array(1, 0, 0, diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt index a84292e598..d77d48e6a4 100644 --- a/ext/standard/tests/math/rand_variation1.phpt +++ b/ext/standard/tests/math/rand_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt index 7c11e39bc9..1aee6af2c7 100644 --- a/ext/standard/tests/math/rand_variation2.phpt +++ b/ext/standard/tests/math/rand_variation2.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index 1d9d6bf8d5..d6b927f2d5 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -30,7 +30,7 @@ $precision = array(2, "2", "04", "3.6", - "2.1e1", + "2.1e1", null, true, false); diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index 48070e967f..454a9129f4 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -66,7 +66,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt index 3ace9f3966..1bb5ec06cc 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -66,7 +66,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt index 9f79ca1c3c..5b635dfbdc 100644 --- a/ext/standard/tests/math/sin_variation.phpt +++ b/ext/standard/tests/math/sin_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt index a212a09975..e47e94d629 100644 --- a/ext/standard/tests/math/sinh_variation.phpt +++ b/ext/standard/tests/math/sinh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index a35730552d..7369b98dfd 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -22,7 +22,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt index 8b73eafc20..8e5a1cc5e8 100644 --- a/ext/standard/tests/math/srand_variation1.phpt +++ b/ext/standard/tests/math/srand_variation1.phpt @@ -65,7 +65,7 @@ $inputs = array( $heredoc, // object data -/*23*/ new classA(), +/*23*/ new classA(), // undefined data /*24*/ @$undefined_var, diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt index 6f54f95234..81546bbf6f 100644 --- a/ext/standard/tests/math/tan_variation.phpt +++ b/ext/standard/tests/math/tan_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt index e15b70cc0f..b1b477c150 100644 --- a/ext/standard/tests/math/tanh_variation.phpt +++ b/ext/standard/tests/math/tanh_variation.phpt @@ -21,7 +21,7 @@ $values = array(23, "23", "23.45", "2.345e1", - "nonsense", + "nonsense", "1000", "1000ABC", null, diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index eb480680ee..312bd89b66 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_browser() function : basic functionality +Test get_browser() function : basic functionality --INI-- browscap={PWD}/browscap.ini --SKIPIF-- @@ -15,9 +15,9 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c * Alias to functions: diff --git a/ext/standard/tests/misc/get_browser_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt index c9c367bb1a..049c8b9431 100644 --- a/ext/standard/tests/misc/get_browser_error.phpt +++ b/ext/standard/tests/misc/get_browser_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_browser() function : error functionality +Test get_browser() function : error functionality --INI-- browscap={PWD}/browscap.ini --SKIPIF-- @@ -15,9 +15,9 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c * Alias to functions: diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index 7bde709888..551206a569 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -15,9 +15,9 @@ browscap={PWD}/browscap.ini --FILE-- <?php /* Prototype : mixed get_browser([string browser_name [, bool return_array]]) - * Description: Get information about the capabilities of a browser. - * If browser_name is omitted or null, HTTP_USER_AGENT is used. - * Returns an object by default; if return_array is true, returns an array. + * Description: Get information about the capabilities of a browser. + * If browser_name is omitted or null, HTTP_USER_AGENT is used. + * Returns an object by default; if return_array is true, returns an array. * * Source code: ext/standard/browscap.c * Alias to functions: diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt index 2be972a134..cac7133e95 100644 --- a/ext/standard/tests/misc/time_sleep_until_basic.phpt +++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt @@ -19,7 +19,7 @@ Michele Orselli mo@ideato.it // to 10th of a second. this means there can be up to a .9 millisecond difference // which will fail this test. this test randomly fails on Windows and this is the cause. // - // fix: round to nearest millisecond + // fix: round to nearest millisecond // passes for up to .5 milliseconds less, fails for more than .5 milliseconds // should be fine since time_sleep_until() on Windows is accurate to the // millisecond(.5 rounded up is 1 millisecond) diff --git a/ext/standard/tests/network/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt index 0430582181..77c7155ea8 100644 --- a/ext/standard/tests/network/closelog_basic.phpt +++ b/ext/standard/tests/network/closelog_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test closelog() function : basic functionality +Test closelog() function : basic functionality --FILE-- <?php /* Prototype : bool closelog(void) - * Description: Close connection to system logger + * Description: Close connection to system logger * Source code: ext/standard/syslog.c * Alias to functions: */ diff --git a/ext/standard/tests/network/closelog_error.phpt b/ext/standard/tests/network/closelog_error.phpt index 5dac063cf6..b72048bd76 100644 --- a/ext/standard/tests/network/closelog_error.phpt +++ b/ext/standard/tests/network/closelog_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test closelog() function : error conditions +Test closelog() function : error conditions --FILE-- <?php /* Prototype : bool closelog(void) - * Description: Close connection to system logger + * Description: Close connection to system logger * Source code: ext/standard/syslog.c * Alias to functions: */ diff --git a/ext/standard/tests/network/fsockopen_basic.phpt b/ext/standard/tests/network/fsockopen_basic.phpt index 5131651db8..4795008b5b 100644 --- a/ext/standard/tests/network/fsockopen_basic.phpt +++ b/ext/standard/tests/network/fsockopen_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test fsockopen() function : basic functionality +Test fsockopen() function : basic functionality --FILE-- <?php /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - * Description: Open Internet or Unix domain socket connection + * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c * Alias to functions: */ diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt index dbbbb6765c..638412b47f 100644 --- a/ext/standard/tests/network/fsockopen_error.phpt +++ b/ext/standard/tests/network/fsockopen_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test fsockopen() function : error conditions +Test fsockopen() function : error conditions --FILE-- <?php /* Prototype : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]]) - * Description: Open Internet or Unix domain socket connection + * Description: Open Internet or Unix domain socket connection * Source code: ext/standard/fsock.c * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbyaddr_basic1.phpt b/ext/standard/tests/network/gethostbyaddr_basic1.phpt index a20b4756c1..0e65937871 100644 --- a/ext/standard/tests/network/gethostbyaddr_basic1.phpt +++ b/ext/standard/tests/network/gethostbyaddr_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbyaddr() function : basic functionality +Test gethostbyaddr() function : basic functionality --FILE-- <?php /* Prototype : string gethostbyaddr ( string $ip_address ) - * Description: Get the Internet host name corresponding to a given IP address + * Description: Get the Internet host name corresponding to a given IP address * Source code: ext/standard/dns.c */ diff --git a/ext/standard/tests/network/gethostbyaddr_error.phpt b/ext/standard/tests/network/gethostbyaddr_error.phpt index 68a0cc7147..f7982d5ca4 100644 --- a/ext/standard/tests/network/gethostbyaddr_error.phpt +++ b/ext/standard/tests/network/gethostbyaddr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbyaddr() function : error conditions +Test gethostbyaddr() function : error conditions --FILE-- <?php /* Prototype : proto string gethostbyaddr(string ip_address) - * Description: Get the Internet host name corresponding to a given IP address + * Description: Get the Internet host name corresponding to a given IP address * Source code: ext/standard/dns.c * Alias to functions: */ diff --git a/ext/standard/tests/network/gethostbyname_basic003.phpt b/ext/standard/tests/network/gethostbyname_basic003.phpt index 2cb3d8d229..2c6a6d3b21 100644 --- a/ext/standard/tests/network/gethostbyname_basic003.phpt +++ b/ext/standard/tests/network/gethostbyname_basic003.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbyname() function : basic functionality +Test gethostbyname() function : basic functionality --FILE-- <?php /* Prototype : string gethostbyname ( string $hostname ) - * Description: Get the IPv4 address corresponding to a given Internet host name + * Description: Get the IPv4 address corresponding to a given Internet host name * Source code: ext/standard/dns.c */ diff --git a/ext/standard/tests/network/gethostbynamel_basic1.phpt b/ext/standard/tests/network/gethostbynamel_basic1.phpt index 9d1580c826..ceb2a843fd 100644 --- a/ext/standard/tests/network/gethostbynamel_basic1.phpt +++ b/ext/standard/tests/network/gethostbynamel_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbynamel() function : basic functionality +Test gethostbynamel() function : basic functionality --FILE-- <?php /* Prototype : array gethostbynamel ( string $hostname ) - * Description: Get a list of IPv4 addresses corresponding to a given Internet host name + * Description: Get a list of IPv4 addresses corresponding to a given Internet host name * Source code: ext/standard/dns.c */ diff --git a/ext/standard/tests/network/gethostbynamel_error.phpt b/ext/standard/tests/network/gethostbynamel_error.phpt index 0ce348187e..9d4c29619b 100644 --- a/ext/standard/tests/network/gethostbynamel_error.phpt +++ b/ext/standard/tests/network/gethostbynamel_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test gethostbynamel() function : error conditions +Test gethostbynamel() function : error conditions --FILE-- <?php /* Prototype : proto array gethostbynamel(string hostname) - * Description: Return a list of IP addresses that a given hostname resolves to. + * Description: Return a list of IP addresses that a given hostname resolves to. * Source code: ext/standard/dns.c * Alias to functions: */ diff --git a/ext/standard/tests/network/ip2long_error.phpt b/ext/standard/tests/network/ip2long_error.phpt index 7c4722d3c7..4816d63943 100644 --- a/ext/standard/tests/network/ip2long_error.phpt +++ b/ext/standard/tests/network/ip2long_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ip2long() function : error conditions +Test ip2long() function : error conditions --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/network/ip2long_variation1.phpt b/ext/standard/tests/network/ip2long_variation1.phpt index 58494a1f17..fa7410930f 100644 --- a/ext/standard/tests/network/ip2long_variation1.phpt +++ b/ext/standard/tests/network/ip2long_variation1.phpt @@ -3,7 +3,7 @@ Test ip2long() function : usage variation 1 --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index e6414ee902..d85b6ba3c9 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -6,7 +6,7 @@ Test ip2long() function : usage variation 2, 32 bit --FILE-- <?php /* Prototype : int ip2long(string ip_address) - * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address + * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/network/long2ip_error.phpt b/ext/standard/tests/network/long2ip_error.phpt index f217d71f88..7003c36806 100644 --- a/ext/standard/tests/network/long2ip_error.phpt +++ b/ext/standard/tests/network/long2ip_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test long2ip() function : error conditions +Test long2ip() function : error conditions --FILE-- <?php /* Prototype : string long2ip(int proper_address) - * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format + * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c * Alias to functions: */ diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt index fbed4cf146..93efc098b5 100644 --- a/ext/standard/tests/network/long2ip_variation1.phpt +++ b/ext/standard/tests/network/long2ip_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test long2ip() function : usage variation +Test long2ip() function : usage variation --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) == "WIN") @@ -8,7 +8,7 @@ if(substr(PHP_OS, 0, 3) == "WIN") --FILE-- <?php /* Prototype : string long2ip(int proper_address) - * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format + * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format * Source code: ext/standard/basic_functions.c * Alias to functions: */ @@ -99,7 +99,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource - 'resource' => $res, + 'resource' => $res, ); // loop through each element of the array for proper_address diff --git a/ext/standard/tests/network/syslog_basic.phpt b/ext/standard/tests/network/syslog_basic.phpt index 973fa95844..47da28f094 100644 --- a/ext/standard/tests/network/syslog_basic.phpt +++ b/ext/standard/tests/network/syslog_basic.phpt @@ -3,7 +3,7 @@ Test syslog() function : basic functionality --FILE-- <?php /* Prototype : bool syslog(int priority, string message) - * Description: Generate a system log message + * Description: Generate a system log message * Source code: ext/standard/syslog.c * Alias to functions: */ diff --git a/ext/standard/tests/network/syslog_error.phpt b/ext/standard/tests/network/syslog_error.phpt index d42be51556..c958af432b 100644 --- a/ext/standard/tests/network/syslog_error.phpt +++ b/ext/standard/tests/network/syslog_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test syslog() function : error conditions +Test syslog() function : error conditions --FILE-- <?php /* Prototype : bool syslog(int priority, string message) - * Description: Generate a system log message + * Description: Generate a system log message * Source code: ext/standard/syslog.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/006.phpt b/ext/standard/tests/serialize/006.phpt index fb813bc0d9..6ba93f4d23 100644 --- a/ext/standard/tests/serialize/006.phpt +++ b/ext/standard/tests/serialize/006.phpt @@ -4,13 +4,13 @@ serialize()/unserialize() with exotic letters <?php $åäöÅÄÖ = array('åäöÅÄÖ' => 'åäöÅÄÖ'); - class ÜberKööliäå + class ÜberKööliäå { public $åäöÅÄÖüÜber = 'åäöÅÄÖ'; } - + $foo = new Überkööliäå(); - + var_dump(serialize($foo)); var_dump(unserialize(serialize($foo))); var_dump(serialize($åäöÅÄÖ)); diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index 15bad692ed..4e61e65354 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -14,7 +14,7 @@ $fakezval = pack( 0x00100000, 0x00000400, 0x00000000, - 0x00000006 + 0x00000006 ); $data = unserialize('a:2:{i:0;O:9:"evilClass":1:{s:4:"name";a:2:{i:0;i:1;i:1;i:2;}}i:1;R:4;}'); diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt index 68727ad104..b8644c44e9 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -11,7 +11,7 @@ class C1 $this->arr1[0] = $this; $this->arr2[0] = $this->arr1[0]; $var1 = &$this->arr1[0]; // Set a reference... - unset($var1); // ... and unset it. + unset($var1); // ... and unset it. } } $Obj1 = new C1(); diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 3de28f3326..1e8cf1acf2 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -10,7 +10,7 @@ serialize_precision=100 * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index f03041f6a9..fd78fdb536 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -8,7 +8,7 @@ serialization: arrays with references amonst elements * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index 55e34f3762..ee89e9a1e2 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -8,7 +8,7 @@ serialization: arrays with references to an external variable * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index 02726d20ea..a6209688ea 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -8,7 +8,7 @@ serialization: arrays with references to the containing array * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index f941a5caec..9d3bbcabea 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -8,7 +8,7 @@ serialization: arrays with references, nested * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ @@ -20,7 +20,7 @@ function check(&$a) { $b = unserialize($ser); - // Change each element and dump result. + // Change each element and dump result. foreach($b as $k=>$v) { if (is_array($v)){ foreach($b[$k] as $sk=>$sv) { diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt index 4d615fddc6..97c2af4ccb 100644 --- a/ext/standard/tests/serialize/serialization_error_001.phpt +++ b/ext/standard/tests/serialize/serialization_error_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Test serialize() & unserialize() functions: error conditions - wrong number of args. +Test serialize() & unserialize() functions: error conditions - wrong number of args. --FILE-- <?php /* Prototype : proto string serialize(mixed variable) @@ -8,7 +8,7 @@ Test serialize() & unserialize() functions: error conditions - wrong number of a * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Binary files differindex 0d800d1516..3617458125 100644 --- a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt +++ b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt Binary files differindex f85b89e102..d887aba236 100644 --- a/ext/standard/tests/serialize/serialization_objects_001.phpt +++ b/ext/standard/tests/serialize/serialization_objects_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt Binary files differindex fbd9e26120..c7f9e1cbd3 100644 --- a/ext/standard/tests/serialize/serialization_objects_002.phpt +++ b/ext/standard/tests/serialize/serialization_objects_002.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt index 30bb34fafb..d72c471fae 100644 --- a/ext/standard/tests/serialize/serialization_objects_003.phpt +++ b/ext/standard/tests/serialize/serialization_objects_003.phpt @@ -10,14 +10,14 @@ serialize_precision=100 * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ echo "\n--- Testing Abstract Class ---\n"; // abstract class -abstract class Name +abstract class Name { public function __construct() { $this->a = 10; @@ -30,7 +30,7 @@ abstract class Name } } // implement abstract class -class extendName extends Name +class extendName extends Name { var $a, $b, $c; diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index bc58ce29e9..ed28341143 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). +Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). --FILE-- <?php /* Prototype : proto string serialize(mixed variable) @@ -8,7 +8,7 @@ Test serialize() & unserialize() functions: objects - ensure that COW references * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt index 9619a2949e..4c631c6a59 100644 --- a/ext/standard/tests/serialize/serialization_objects_005.phpt +++ b/ext/standard/tests/serialize/serialization_objects_005.phpt @@ -8,7 +8,7 @@ Check behaviour of incomplete class * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_006.phpt b/ext/standard/tests/serialize/serialization_objects_006.phpt index 345ce0a77e..93fb726b4c 100644 --- a/ext/standard/tests/serialize/serialization_objects_006.phpt +++ b/ext/standard/tests/serialize/serialization_objects_006.phpt @@ -8,7 +8,7 @@ Behaviour of incomplete class is preserved even when it was not created by unser * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_007.phpt b/ext/standard/tests/serialize/serialization_objects_007.phpt index 4de50afd6b..ff584a0919 100644 --- a/ext/standard/tests/serialize/serialization_objects_007.phpt +++ b/ext/standard/tests/serialize/serialization_objects_007.phpt @@ -8,7 +8,7 @@ Ensure __autoload is called twice if unserialize_callback_func is defined. * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt index 6d1c0e038d..484d38216d 100644 --- a/ext/standard/tests/serialize/serialization_objects_008.phpt +++ b/ext/standard/tests/serialize/serialization_objects_008.phpt @@ -8,7 +8,7 @@ Bad unserialize_callback_func * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt index 8ec0588784..0c969df7cd 100644 --- a/ext/standard/tests/serialize/serialization_objects_009.phpt +++ b/ext/standard/tests/serialize/serialization_objects_009.phpt @@ -8,7 +8,7 @@ Custom unserialization of classes with no custom unserializer. * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index e03440fb7a..60b9f23f31 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -8,7 +8,7 @@ Serialize() must return a string or NULL * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt index bd1e75449f..09b3046d05 100644 --- a/ext/standard/tests/serialize/serialization_objects_011.phpt +++ b/ext/standard/tests/serialize/serialization_objects_011.phpt @@ -8,7 +8,7 @@ Object serialization / unserialization with inherited and hidden properties. * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ @@ -44,8 +44,8 @@ Class C extends B { public $CPub = "C.CPub"; function audit() { - return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, - $this->BProt, $this->BPub, + return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, + $this->BProt, $this->BPub, $this->CPriv, $this->CProt, $this->CPub); } } diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt index 90d9e8f99d..b834de3221 100644 --- a/ext/standard/tests/serialize/serialization_objects_012.phpt +++ b/ext/standard/tests/serialize/serialization_objects_012.phpt @@ -8,7 +8,7 @@ Object serialization / unserialization: real references and COW references * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index eaaf05e7c5..1d4ec1c1ec 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -1,5 +1,5 @@ --TEST-- -Object serialization / unserialization: references amongst properties +Object serialization / unserialization: references amongst properties --FILE-- <?php /* Prototype : proto string serialize(mixed variable) @@ -8,7 +8,7 @@ Object serialization / unserialization: references amongst properties * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index d4cfc770db..c1681df37d 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -1,5 +1,5 @@ --TEST-- -Object serialization / unserialization: references to external values +Object serialization / unserialization: references to external values --FILE-- <?php /* Prototype : proto string serialize(mixed variable) @@ -8,7 +8,7 @@ Object serialization / unserialization: references to external values * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 9e9e6ae07d..c1a6675db4 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -1,5 +1,5 @@ --TEST-- -Object serialization / unserialization: properties reference containing object +Object serialization / unserialization: properties reference containing object --FILE-- <?php diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index 11b86cdf70..b4a83effd8 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -10,7 +10,7 @@ serialize_precision=10 * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index d17865f329..59f09120c7 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -10,7 +10,7 @@ serialize_precision=75 * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt index 089ad13fa7..233b31ba64 100644 --- a/ext/standard/tests/serialize/serialization_resources_001.phpt +++ b/ext/standard/tests/serialize/serialization_resources_001.phpt @@ -8,7 +8,7 @@ Test serialize() & unserialize() functions: resources * Alias to functions: */ /* Prototype : proto mixed unserialize(string variable_representation) - * Description: Takes a string representation of variable and recreates it + * Description: Takes a string representation of variable and recreates it * Source code: ext/standard/var.c * Alias to functions: */ diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt index 84e818f9aa..7fead5362f 100644 --- a/ext/standard/tests/streams/bug61019.phpt +++ b/ext/standard/tests/streams/bug61019.phpt @@ -24,7 +24,7 @@ if(is_resource($process)) $stderr_stream=""; echo "External command executed\n"; - do + do { $process_state=proc_get_status($process); $tmp_stdin=stream_get_contents($pipes[1]); diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt index bd04a5e6b2..67c66d61bc 100644 --- a/ext/standard/tests/streams/bug64433.phpt +++ b/ext/standard/tests/streams/bug64433.phpt @@ -27,7 +27,7 @@ foreach($codes as $code) { echo "follow=0\n"; $arr = array('http'=> array( - 'follow_location'=>0, + 'follow_location'=>0, ) ); $context = stream_context_create($arr); @@ -37,7 +37,7 @@ foreach($codes as $code) { echo "follow=1\n"; $arr = array('http'=> array( - 'follow_location'=>1, + 'follow_location'=>1, ) ); $context = stream_context_create($arr); diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index fd02b8c0bc..c96a842793 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -7,7 +7,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); --FILE-- <?php -/* What is checked here is +/* What is checked here is - start a server and listen - as soon as client connects, close connection and exit - on the client side - sleep(1) and check feof() diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt index b38ccbdda8..ebb358707e 100644 --- a/ext/standard/tests/streams/bug72771.phpt +++ b/ext/standard/tests/streams/bug72771.phpt @@ -16,7 +16,7 @@ $path="ftps://127.0.0.1:" . $port."/"; $ds=opendir($path, $context); var_dump($ds); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index f44c26d8a6..a49a2026b7 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -16,7 +16,7 @@ $path="ftp://127.0.0.1:" . $port."/bug73457"; $ds=file_get_contents($path); var_dump($ds); ?> -==DONE== +==DONE== --EXPECTF-- Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug75031.phpt b/ext/standard/tests/streams/bug75031.phpt index f0d67a3524..4787b97171 100644 --- a/ext/standard/tests/streams/bug75031.phpt +++ b/ext/standard/tests/streams/bug75031.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #75031: Append mode in php://temp and php://memory +Bug #75031: Append mode in php://temp and php://memory --FILE-- <?php diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index 28fa43cf26..d2d2ce8b9c 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -14,7 +14,7 @@ $path="ftp://localhost:" . $port."/bogusdir"; var_dump(opendir($path)); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-002.phpt b/ext/standard/tests/streams/opendir-002.phpt index 83d40e8bb1..a995979992 100644 --- a/ext/standard/tests/streams/opendir-002.phpt +++ b/ext/standard/tests/streams/opendir-002.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftp://' stream. +opendir() with 'ftp://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -21,7 +21,7 @@ while ($fn=readdir($ds)) { closedir($ds); ?> -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 1d6a9057fa..2b3aedbf30 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -18,7 +18,7 @@ $context = stream_context_create(array('ssl' => array('cafile' => __DIR__ . '/. var_dump(opendir($path, $context)); ?> -==DONE== +==DONE== --EXPECTF-- Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d diff --git a/ext/standard/tests/streams/opendir-004.phpt b/ext/standard/tests/streams/opendir-004.phpt index b50c6580c2..06a3f944be 100644 --- a/ext/standard/tests/streams/opendir-004.phpt +++ b/ext/standard/tests/streams/opendir-004.phpt @@ -1,5 +1,5 @@ --TEST-- -opendir() with 'ftps://' stream. +opendir() with 'ftps://' stream. --SKIPIF-- <?php if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available."); @@ -22,7 +22,7 @@ while ($fn=readdir($ds)) { var_dump($fn); } ?> -==DONE== +==DONE== --EXPECTF-- resource(%d) of type (stream) string(5) "file1" diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt index 401c65bce0..1e5b7e31d8 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt @@ -16,7 +16,7 @@ $ctxt = stream_context_create([ $stream = stream_socket_client( "tcp://www.php.net:80", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $ctxt); -$socket = +$socket = socket_import_stream($stream); var_dump(socket_get_option($socket, SOL_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt index bf35925e4d..3f4fc48667 100644 --- a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt +++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt @@ -15,7 +15,7 @@ $ctxt = stream_context_create([ $stream = fopen("http://www.php.net", "r", false, $ctxt); -$socket = +$socket = @socket_import_stream($stream); var_dump(socket_get_option($socket, STREAM_IPPROTO_TCP, TCP_NODELAY) > 0); diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt index a133ef1e08..bb98d7c6e7 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test stream_get_meta_data() function : error conditions +Test stream_get_meta_data() function : error conditions --FILE-- <?php /* Prototype : proto array stream_get_meta_data(resource fp) - * Description: Retrieves header/meta data from streams/file pointers + * Description: Retrieves header/meta data from streams/file pointers * Source code: ext/standard/streamsfuncs.c * Alias to functions: socket_get_status */ diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt index d54eb04410..f7ccc7783b 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt @@ -16,7 +16,7 @@ fclose($fp); // open file in each access mode and get meta data foreach ($filemodes as $mode) { if (strncmp($mode, 'x', 1) == 0) { - // x modes require that file does not exist + // x modes require that file does not exist unlink($filename); } $fp = fopen($filename, $mode); diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt index 63c9a8df42..0334b951e0 100644 --- a/ext/standard/tests/streams/stream_set_timeout_error.phpt +++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test stream_set_timeout() function : error conditions +Test stream_set_timeout() function : error conditions --FILE-- <?php /* Prototype : proto bool stream_set_timeout(resource stream, int seconds, int microseconds) - * Description: Set timeout on stream read to seconds + microseonds + * Description: Set timeout on stream read to seconds + microseonds * Source code: ext/standard/streamsfuncs.c * Alias to functions: socket_set_timeout */ diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt Binary files differindex c9722c7fe7..4080c7214d 100644 --- a/ext/standard/tests/strings/addcslashes_001.phpt +++ b/ext/standard/tests/strings/addcslashes_001.phpt diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt Binary files differindex 7c97adfa2d..f743726301 100644 --- a/ext/standard/tests/strings/addcslashes_003.phpt +++ b/ext/standard/tests/strings/addcslashes_003.phpt diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index eeb5627067..8b2c7fb2e4 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test addslashes() function : basic functionality +Test addslashes() function : basic functionality --FILE-- <?php /* Prototype : string addslashes ( string $str ) - * Description: Returns a string with backslashes before characters (single quotes, double quote, + * Description: Returns a string with backslashes before characters (single quotes, double quote, * backslash and nul character) that need to be quoted in database queries etc. * Source code: ext/standard/string.c */ /* - * Testing addslashes() with strings containing characters that can be prefixed with backslash + * Testing addslashes() with strings containing characters that can be prefixed with backslash * by the function */ diff --git a/ext/standard/tests/strings/addslashes_error.phpt b/ext/standard/tests/strings/addslashes_error.phpt index e920dfd1c4..c5d67c09ae 100644 --- a/ext/standard/tests/strings/addslashes_error.phpt +++ b/ext/standard/tests/strings/addslashes_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test addslashes() function : error conditions +Test addslashes() function : error conditions --FILE-- <?php /* Prototype : string addslashes ( string $str ) diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt index 1120cdf494..e204498ba6 100644 --- a/ext/standard/tests/strings/addslashes_variation1.phpt +++ b/ext/standard/tests/strings/addslashes_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test addslashes() function : usage variations - non-string type argument +Test addslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string addslashes ( string $str ) @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - non-string type argument */ /* - * Test addslashes() with non-string type argument such as int, float, etc + * Test addslashes() with non-string type argument such as int, float, etc */ echo "*** Testing addslashes() : with non-string type argument ***\n"; diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt index 260b1f0653..628980df27 100644 --- a/ext/standard/tests/strings/addslashes_variation2.phpt +++ b/ext/standard/tests/strings/addslashes_variation2.phpt @@ -8,7 +8,7 @@ Test addslashes() function : usage variations - strings with characters to be ba */ /* - * Test addslashes() with various strings containing characters thats can be backslashed + * Test addslashes() with various strings containing characters thats can be backslashed */ echo "*** Testing addslashes() : with various strings containing characters to be backslashed ***\n"; diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt Binary files differindex 31299276b3..0a598b8bfa 100644 --- a/ext/standard/tests/strings/basename_basic.phpt +++ b/ext/standard/tests/strings/basename_basic.phpt diff --git a/ext/standard/tests/strings/basename_error.phpt b/ext/standard/tests/strings/basename_error.phpt index bd7741d0e9..8309c3578b 100644 --- a/ext/standard/tests/strings/basename_error.phpt +++ b/ext/standard/tests/strings/basename_error.phpt @@ -4,17 +4,17 @@ Test basename() function : error conditions <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ echo "*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( basename() ); // more than expected no. of arguments var_dump( basename("/var/tmp/bar.gz", ".gz", ".gz") ); -// passing invalid type arguments +// passing invalid type arguments $object = new stdclass; var_dump( basename( array("string/bar") ) ); var_dump( basename( array("string/bar"), "bar" ) ); diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index 8928fa1aeb..9211f1f7c2 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) == "WIN")) <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ diff --git a/ext/standard/tests/strings/basename_invalid_path_win.phpt b/ext/standard/tests/strings/basename_invalid_path_win.phpt index 587f2b114c..3cb74c21ed 100644 --- a/ext/standard/tests/strings/basename_invalid_path_win.phpt +++ b/ext/standard/tests/strings/basename_invalid_path_win.phpt @@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) != "WIN")) <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index e958a2c8f4..1da6c18113 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -4,7 +4,7 @@ Test basename() function : usage variations <?php /* Prototype: string basename ( string $path [, string $suffix] ); Description: Given a string containing a path to a file, - this function will return the base name of the file. + this function will return the base name of the file. If the filename ends in suffix this will also be cut off. */ $file_path_variations = array ( diff --git a/ext/standard/tests/strings/bin2hex_basic.phpt b/ext/standard/tests/strings/bin2hex_basic.phpt index 7a0f3dde0d..9eb07b573e 100644 --- a/ext/standard/tests/strings/bin2hex_basic.phpt +++ b/ext/standard/tests/strings/bin2hex_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bin2hex() function : basic functionality +Test bin2hex() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/bin2hex_error.phpt b/ext/standard/tests/strings/bin2hex_error.phpt index 9d2e1313a1..efee90bdee 100644 --- a/ext/standard/tests/strings/bin2hex_error.phpt +++ b/ext/standard/tests/strings/bin2hex_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test bin2hex() function : error conditions +Test bin2hex() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing bin2hex() function with more than expected no. of arguments - $extra_arg = 10; var_dump( bin2hex("Hello World", $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing bin2hex() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: bin2hex() expects exactly 1 parameter, 2 given in %s on line %d NULL - ===DONE=== diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt index 6317c974ab..3c52250718 100644 --- a/ext/standard/tests/strings/bug36306.phpt +++ b/ext/standard/tests/strings/bug36306.phpt @@ -6,7 +6,7 @@ Bug #36306 (crc32() 64bit) /* as an example how to write crc32 tests PHP does not have uint values, you cannot display crc32 like a signed integer. - Have to find some small strings to truly reproduce + Have to find some small strings to truly reproduce the problem, this example being not a problem */ echo dechex(crc32("platform independent")) . "\n"; diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt Binary files differindex f1973eeaf4..9297050a99 100644 --- a/ext/standard/tests/strings/bug39621.phpt +++ b/ext/standard/tests/strings/bug39621.phpt diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index e6011dd5f7..ff7dbf4b8c 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -9,7 +9,7 @@ $adata = str_getcsv($csv,";"); $b2 = basename($filename); if ($filename != $b2) print "BUG"; -else +else print "OKEY"; --EXPECT-- OKEY diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt Binary files differindex 7b68ca28d0..7e25ec12e3 100644 --- a/ext/standard/tests/strings/chop_basic.phpt +++ b/ext/standard/tests/strings/chop_basic.phpt diff --git a/ext/standard/tests/strings/chop_error.phpt b/ext/standard/tests/strings/chop_error.phpt index 71a1004ecd..2f2656f3aa 100644 --- a/ext/standard/tests/strings/chop_error.phpt +++ b/ext/standard/tests/strings/chop_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chop() function : error conditions +Test chop() function : error conditions --FILE-- <?php /* Prototype : string chop ( string $str [, string $charlist] ) diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt index a5bf0afc48..51f53f0153 100644 --- a/ext/standard/tests/strings/chop_variation1.phpt +++ b/ext/standard/tests/strings/chop_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chop() function : usage variations - unexpected values for str argument +Test chop() function : usage variations - unexpected values for str argument --FILE-- <?php /* Prototype : string chop ( string $str [, string $charlist] ) diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt index bce4184d42..e072febcff 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chr() function : basic functionality +Test chr() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/chr_ord.phpt b/ext/standard/tests/strings/chr_ord.phpt Binary files differindex b5015a0108..be0b1a32da 100644 --- a/ext/standard/tests/strings/chr_ord.phpt +++ b/ext/standard/tests/strings/chr_ord.phpt diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index a1a269080e..cce8e4d64c 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test chunk_split() function : basic functionality +Test chunk_split() function : basic functionality --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) - * Description: Returns split line + * Description: Returns split line * Source code: ext/standard/string.c * Alias to functions: */ /* -* Testing chunk_split() for basic functionality by passing all possible -* arguments as well as with default arguments chunklen and ending +* Testing chunk_split() for basic functionality by passing all possible +* arguments as well as with default arguments chunklen and ending */ echo "*** Testing chunk_split() : basic functionality ***\n"; @@ -35,7 +35,7 @@ var_dump( chunk_split($str, $chunklen) ); echo "-- Testing chunk_split() with default chunklen and ending string --\n"; var_dump( chunk_split($str) ); -echo "Done" +echo "Done" ?> --EXPECT-- *** Testing chunk_split() : basic functionality *** diff --git a/ext/standard/tests/strings/chunk_split_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt index 341f04ffd3..d8a72586af 100644 --- a/ext/standard/tests/strings/chunk_split_error.phpt +++ b/ext/standard/tests/strings/chunk_split_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : error conditions +Test chunk_split() function : error conditions --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) @@ -9,8 +9,8 @@ Test chunk_split() function : error conditions */ /* -* Testing error conditions of chunk_split() with zero arguments -* and for more than expected number of arguments +* Testing error conditions of chunk_split() with zero arguments +* and for more than expected number of arguments */ echo "*** Testing chunk_split() : error conditions ***\n"; diff --git a/ext/standard/tests/strings/chunk_split_variation1.phpt b/ext/standard/tests/strings/chunk_split_variation1.phpt index 5f41c86dc3..0b24f9b6d9 100644 --- a/ext/standard/tests/strings/chunk_split_variation1.phpt +++ b/ext/standard/tests/strings/chunk_split_variation1.phpt @@ -81,7 +81,7 @@ $values = array( @$unset_var, // resource data - $fp + $fp ); // loop through each element of the array for 'str' diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt index c08a0c3d88..67b0f3e76b 100644 --- a/ext/standard/tests/strings/chunk_split_variation11.phpt +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt @@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - different strings for 'ending' /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) * Description: Returns split line * Source code: ext/standard/string.c - * Alias to functions: none + * Alias to functions: none */ /* @@ -26,7 +26,7 @@ $chunklen = 6E+0; //different values for 'ending' $values = array ( - "", //empty + "", //empty " ", //space "a", //single char "ENDING", //regular string diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt index 2162b96522..bafd9f44ae 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument +Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index 640df405f7..e7fc0744ee 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test chunk_split() function : usage variations - different heredoc strings as 'str' argument +Test chunk_split() function : usage variations - different heredoc strings as 'str' argument --FILE-- <?php /* Prototype : string chunk_split(string $str [, int $chunklen [, string $ending]]) diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt Binary files differindex 332aecdb96..8a5a8cd6bb 100644 --- a/ext/standard/tests/strings/chunk_split_variation5.phpt +++ b/ext/standard/tests/strings/chunk_split_variation5.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 84a3a5ab67..c3456a70c4 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -23,17 +23,17 @@ $ending = "):("; $values = array( '', //empty ' ', //space - 'This is simple string', //regular string + 'This is simple string', //regular string 'It\'s string with quotes', - 'This contains @ # $ % ^ & chars', //special characters - 'This string\tcontains\rwhite space\nchars', //with white space chars + 'This contains @ # $ % ^ & chars', //special characters + 'This string\tcontains\rwhite space\nchars', //with white space chars 'This is string with 1234 numbers', - 'This is string with \0 and ".chr(0)."null chars', //for binary safe + 'This is string with \0 and ".chr(0)."null chars', //for binary safe 'This is string with multiple space char', 'This is to check string with ()', ' Testing with multiple spaces ', 'Testing invalid \k and \m escape char', - 'This is to check with \\n and \\t' + 'This is to check with \\n and \\t' ); diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt Binary files differindex 0cd3bec922..fa9cc43086 100644 --- a/ext/standard/tests/strings/chunk_split_variation7.phpt +++ b/ext/standard/tests/strings/chunk_split_variation7.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt Binary files differindex c7989b0539..36bb26b4bc 100644 --- a/ext/standard/tests/strings/chunk_split_variation9.phpt +++ b/ext/standard/tests/strings/chunk_split_variation9.phpt diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e38fb3f639..8a368e17ef 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_cyr_string() function : basic functionality +Test convert_cyr_string() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/convert_cyr_string_error.phpt b/ext/standard/tests/strings/convert_cyr_string_error.phpt index 844f2d74d8..66effea430 100644 --- a/ext/standard/tests/strings/convert_cyr_string_error.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_cyr_string() function : error conditions +Test convert_cyr_string() function : error conditions --FILE-- <?php @@ -33,7 +33,7 @@ var_dump(bin2hex( convert_cyr_string($str, $from, "?")) ); echo "\n-- Testing convert_cyr_string() function with invalid 'from' and 'to' character set --\n"; var_dump(bin2hex( convert_cyr_string($str, ">", "?")) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_cyr_string() : error conditions *** @@ -69,5 +69,4 @@ Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d string(10) "68656c6c6f" - -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 3552f6d674..963c163761 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : basic functionality +Test convert_uudecode() function : basic functionality --FILE-- <?php @@ -47,7 +47,7 @@ foreach($strings as $string) { echo "TEST PASSED\n"; ?> -===DONE=== +===DONE=== --EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED diff --git a/ext/standard/tests/strings/convert_uudecode_error.phpt b/ext/standard/tests/strings/convert_uudecode_error.phpt index 77d3a88833..77ac18b50b 100644 --- a/ext/standard/tests/strings/convert_uudecode_error.phpt +++ b/ext/standard/tests/strings/convert_uudecode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uudecode() function : error conditions +Test convert_uudecode() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing convert_uudecode() function with more than expected no. of ar $extra_arg = 10; var_dump( convert_uudecode(72, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_uudecode() : error conditions *** @@ -31,5 +31,4 @@ bool(false) Warning: convert_uudecode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt index 2d4851945e..b8c338a1c6 100644 --- a/ext/standard/tests/strings/convert_uuencode_basic.phpt +++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : basic functionality +Test convert_uuencode() function : basic functionality --FILE-- <?php @@ -39,7 +39,7 @@ foreach($strings as $string) { ?> -===DONE=== +===DONE=== --EXPECTF-- *** Testing convert_uuencode() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/convert_uuencode_error.phpt b/ext/standard/tests/strings/convert_uuencode_error.phpt index a995e18fe2..ec4d3f6477 100644 --- a/ext/standard/tests/strings/convert_uuencode_error.phpt +++ b/ext/standard/tests/strings/convert_uuencode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test convert_uuencode() function : error conditions +Test convert_uuencode() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing convert_uuencode() function with more than expected no. of ar $extra_arg = 10; var_dump( convert_uuencode(72, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing convert_uuencode() : error conditions *** @@ -31,5 +31,4 @@ bool(false) Warning: convert_uuencode() expects exactly 1 parameter, 2 given in %s on line %d bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index f74496214a..c39889be15 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test count_chars() function : basic functionality +Test count_chars() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt index 2ddc2f9618..9c7794b96f 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -3,7 +3,7 @@ Test crc32() function : basic functionality --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt index 71798ed002..98680cde34 100644 --- a/ext/standard/tests/strings/crc32_error.phpt +++ b/ext/standard/tests/strings/crc32_error.phpt @@ -3,7 +3,7 @@ Test crc32() function : error conditions --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt index 28f01e0f7c..1d6f33ec2e 100644 --- a/ext/standard/tests/strings/crc32_variation1.phpt +++ b/ext/standard/tests/strings/crc32_variation1.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index 51ccca8beb..76e57c57f7 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index 505446a1bd..691703103e 100644 --- a/ext/standard/tests/strings/crc32_variation3.phpt +++ b/ext/standard/tests/strings/crc32_variation3.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt index 00b47dc190..f3f11972fb 100644 --- a/ext/standard/tests/strings/crc32_variation4.phpt +++ b/ext/standard/tests/strings/crc32_variation4.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4) --FILE-- <?php /* Prototype : string crc32(string $str) - * Description: Calculate the crc32 polynomial of a string + * Description: Calculate the crc32 polynomial of a string * Source code: ext/standard/crc32.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/dirname_error.phpt b/ext/standard/tests/strings/dirname_error.phpt index 303a59b2d5..98a9ea5b45 100644 --- a/ext/standard/tests/strings/dirname_error.phpt +++ b/ext/standard/tests/strings/dirname_error.phpt @@ -6,7 +6,7 @@ Test dirname() function : error conditions Description: Returns directory name component of path. */ echo "*** Testing error conditions ***\n"; -// zero arguments +// zero arguments var_dump( dirname() ); // Bad arg diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt index f4a90573f3..6842947605 100644 --- a/ext/standard/tests/strings/explode1.phpt +++ b/ext/standard/tests/strings/explode1.phpt @@ -6,9 +6,9 @@ precision=14 --FILE-- <?php /* Prototype: array explode ( string $delimiter, string $string [, int $limit] ); - Description: Returns an array of strings, each of which is a substring of string + Description: Returns an array of strings, each of which is a substring of string formed by splitting it on boundaries formed by the string delimiter. - If limit is set, the returned array will contain a maximum of limit + If limit is set, the returned array will contain a maximum of limit elements with the last element containing the rest of string. */ @@ -28,7 +28,7 @@ $delimiters = array ( ); $string = "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"; /* loop prints an array of strings, each of which is a substring of $string - formed by splitting it on boundaries formed by the string $delimiter. + formed by splitting it on boundaries formed by the string $delimiter. */ $counter = 1; foreach($delimiters as $delimiter) { diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt index 7ff0aa9a41..8ec12b2364 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -17,7 +17,7 @@ asort( $tt ); var_dump( $tt ); echo "-- with table = HTML_SPECIALCHARS --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "WINDOWS-1252"); asort( $tt ); var_dump( $tt ); diff --git a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt index 52ba2f44f3..1715b0852b 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt @@ -25,7 +25,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "Windows-1251 var_dump( count($tt) ); echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n"; -$table = HTML_SPECIALCHARS; +$table = HTML_SPECIALCHARS; $tt = get_html_translation_table($table, ENT_COMPAT, "Windows-1251"); uksort( $tt, 'so' ); var_dump( count($tt) ); diff --git a/ext/standard/tests/strings/get_html_translation_table_error.phpt b/ext/standard/tests/strings/get_html_translation_table_error.phpt index 149adbc197..5adfe98478 100644 --- a/ext/standard/tests/strings/get_html_translation_table_error.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test get_html_translation_table() function : error conditions +Test get_html_translation_table() function : error conditions --FILE-- <?php /* Prototype : array get_html_translation_table ( [int $table [, int $quote_style [, string charset_hint]]] ) diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt index b7fd6f5775..0794853e8e 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -8,7 +8,7 @@ Test get_html_translation_table() function : usage variations - unexpected table */ /* - * test get_html_translation_table() with unexpected value for argument $table + * test get_html_translation_table() with unexpected value for argument $table */ echo "*** Testing get_html_translation_table() : usage variations ***\n"; @@ -19,7 +19,7 @@ $quote_style = ENT_COMPAT; $unset_var = 10; unset($unset_var); -// a resource variable +// a resource variable $fp = fopen(__FILE__, "r"); // array with different values diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt index 907eda35ae..8d9fe0af56 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt @@ -57,7 +57,7 @@ $values = array ( null, // resource var - $fp, + $fp, // undefined variable @$undefined_var, diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index 5cdd86ca36..cc32d654e8 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrev() function : basic functionality +Test hebrev() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/hebrev_error.phpt b/ext/standard/tests/strings/hebrev_error.phpt index 8abf68cd70..a04e519db5 100644 --- a/ext/standard/tests/strings/hebrev_error.phpt +++ b/ext/standard/tests/strings/hebrev_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrev() function : error conditions +Test hebrev() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing hebrev() function with more than expected no. of arguments -- $extra_arg = 10; var_dump( hebrev("Hello World", 5, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing hebrev() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: hebrev() expects at most 2 parameters, 3 given in %s on line %d NULL - -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 2eaa6d712c..d8b4a5484b 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrevc() function : basic functionality +Test hebrevc() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/hebrevc_error.phpt b/ext/standard/tests/strings/hebrevc_error.phpt index f75abb3a4d..630c995b18 100644 --- a/ext/standard/tests/strings/hebrevc_error.phpt +++ b/ext/standard/tests/strings/hebrevc_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test hebrevc() function : error conditions +Test hebrevc() function : error conditions --FILE-- <?php @@ -17,7 +17,7 @@ echo "\n-- Testing hebrevc() function with more than expected no. of arguments - $extra_arg = 10; var_dump( hebrevc("Hello World", 5, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing hebrevc() : error conditions *** @@ -31,5 +31,4 @@ NULL Warning: hebrevc() expects at most 2 parameters, 3 given in %s on line %d NULL - ===DONE=== diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index d1a0323c58..65636908e6 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -36,7 +36,7 @@ var_dump(highlight_file($filename)); @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt index f2e107a735..5f54ee6753 100644 --- a/ext/standard/tests/strings/htmlentities.phpt +++ b/ext/standard/tests/strings/htmlentities.phpt @@ -3,7 +3,7 @@ HTML entities of ISO-8859 chars --INI-- output_handler= --FILE-- -<?php +<?php setlocale (LC_CTYPE, "C"); $sc_encoded = htmlspecialchars ("<>\"&åÄ\n",ENT_COMPAT,"ISO-8859-1"); echo $sc_encoded; diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt index 3ef932a70b..44396b0e2b 100644 --- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test htmlspecialchars() function : basic functionality +Test htmlspecialchars() function : basic functionality --FILE-- <?php /* Prototype : string htmlspecialchars ( string $string [, int $quote_style [, string $charset [, bool $double_encode ]]] ) diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index 4e83b5de5c..c43d385563 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -1,16 +1,16 @@ --TEST-- -Test htmlspecialchars_decode() function : basic functionality +Test htmlspecialchars_decode() function : basic functionality --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ echo "*** Testing htmlspecialchars_decode() : basic functionality ***\n"; -// Initialise arguments +// Initialise arguments //value initialized = Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. "double quoted string" $single_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; $double_quote_string = "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string ""; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt index f4201d2842..36b8e6bbec 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test htmlspecialchars_decode() function : error conditions +Test htmlspecialchars_decode() function : error conditions --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt index 2bbe274d71..4b4af9c63f 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt @@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ @@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; //get a class -class classA +class classA { function __toString() { return "ClassAObject"; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt index 0046236259..4a8f165e9c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt @@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f --FILE-- <?php /* Prototype : string htmlspecialchars_decode(string $string [, int $quote_style]) - * Description: Convert special HTML entities back to characters + * Description: Convert special HTML entities back to characters * Source code: ext/standard/html.c */ @@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; // Initialise function arguments -// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " +// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " $string = "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "</html>"; //get a class diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index 85e34b8c8d..8aa9479e5c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -8,7 +8,7 @@ Test htmlspecialchars_decode() function : usage variations - double quoted strin */ /* - * testing htmlspecialchars_decode() for various double quoted strings as argument for $string + * testing htmlspecialchars_decode() for various double quoted strings as argument for $string */ echo "*** Testing htmlspecialchars_decode() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt Binary files differindex eb94c9f5ca..596a883be2 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 4a70404ce0..7b73982c0c 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test http_build_query() function: usage variations - first arguments as object +Test http_build_query() function: usage variations - first arguments as object --CREDITS-- Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt index 9edcf43e81..2b8ca148ff 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -5,7 +5,7 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index d6d50d1e85..c9b03141bf 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -5,7 +5,7 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com> --FILE-- <?php /* Prototype : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] ) - * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. + * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. * Source code: ext/standard/http.c */ diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt Binary files differindex 3720c06927..d5de391e96 100644 --- a/ext/standard/tests/strings/implode1.phpt +++ b/ext/standard/tests/strings/implode1.phpt diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 1bf9a89c9a..483976d942 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : basic functionality +Test join() function : basic functionality --FILE-- <?php /* Prototype : string join( string $glue, array $pieces ) diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index 3c72422907..36ee9d7ba6 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -22,7 +22,7 @@ $extra_arg = 10; var_dump( join($glue, $pieces, $extra_arg) ); -// Less than expected number of arguments +// Less than expected number of arguments echo "\n-- Testing join() with less than expected no. of arguments --\n"; $glue = 'string_val'; diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt index 93f9822e2a..c3799cc01a 100644 --- a/ext/standard/tests/strings/join_variation3.phpt +++ b/ext/standard/tests/strings/join_variation3.phpt @@ -9,7 +9,7 @@ Test join() function : usage variations - different values for 'pieces' argument */ /* - * test join() by giving different pieces values + * test join() by giving different pieces values */ echo "*** Testing join() : usage variations ***\n"; diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt index a02efd7767..361f65bbc5 100644 --- a/ext/standard/tests/strings/join_variation5.phpt +++ b/ext/standard/tests/strings/join_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test join() function : usage variations - sub array as argument +Test join() function : usage variations - sub array as argument --FILE-- <?php /* Prototype : string join( string $glue, array $pieces ) diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt Binary files differindex 412f36cda0..08938bfad7 100644 --- a/ext/standard/tests/strings/join_variation6.phpt +++ b/ext/standard/tests/strings/join_variation6.phpt diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt Binary files differindex 9451ea80a3..d09e51eef5 100644 --- a/ext/standard/tests/strings/lcfirst.phpt +++ b/ext/standard/tests/strings/lcfirst.phpt diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt index 0d0eae88f7..45967fa24b 100644 --- a/ext/standard/tests/strings/ltrim_basic.phpt +++ b/ext/standard/tests/strings/ltrim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ltrim() function : basic functionality +Test ltrim() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt index eb4f938152..4d6e413672 100644 --- a/ext/standard/tests/strings/ltrim_error.phpt +++ b/ext/standard/tests/strings/ltrim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ltrim() function : error conditions +Test ltrim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index 86377e227d..e9898cd0c0 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test md5() function : basic functionality +Test md5() function : basic functionality --FILE-- <?php /* Prototype : string md5 ( string $str [, bool $raw_output= false ] ) diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex 777140957c..8e91776781 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 8b87c375ac..61fd816dae 100644 --- a/ext/standard/tests/strings/money_format_basic1.phpt +++ b/ext/standard/tests/strings/money_format_basic1.phpt @@ -23,13 +23,13 @@ $value = 1234.5678; $negative_value = -1234.5678; // Format with 14 positions of width, 8 digits of -// left precision, 2 of right precision using national +// left precision, 2 of right precision using national // format for en_US echo "Format values with 14 positions, 8 digits to left, 2 to right using national format\n"; echo gettype(money_format('%14#8.2n', $value))."\n"; echo gettype(money_format('%14#8.2n', $negative_value))."\n"; -// Same again but use '(' for negative values +// Same again but use '(' for negative values echo "Format again but with ( for negative values\n"; echo gettype(money_format('%(14#8.2n', $value))."\n"; echo gettype(money_format('%(14#8.2n', $negative_value))."\n"; diff --git a/ext/standard/tests/strings/nl2br_error.phpt b/ext/standard/tests/strings/nl2br_error.phpt index dbf4227378..b40e7b16a5 100644 --- a/ext/standard/tests/strings/nl2br_error.phpt +++ b/ext/standard/tests/strings/nl2br_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test nl2br() function : error conditions +Test nl2br() function : error conditions --FILE-- <?php /* Prototype : string nl2br(string $str) diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index 21268d0329..1d1d6592b4 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -7,7 +7,7 @@ Test nl2br() function : usage variations - double quoted strings for 'str' argum * Source code: ext/standard/string.c */ -/* Test nl2br() function by passing double quoted strings containing various +/* Test nl2br() function by passing double quoted strings containing various * combinations of new line chars to 'str' argument */ @@ -22,7 +22,7 @@ $strings = array( "Hello\r\nWorld", "\r\nHello\r\nWorld\r\n", - //one blank line + //one blank line " ", diff --git a/ext/standard/tests/strings/nl2br_variation5.phpt b/ext/standard/tests/strings/nl2br_variation5.phpt index beebe03fe2..06a70cbc41 100644 --- a/ext/standard/tests/strings/nl2br_variation5.phpt +++ b/ext/standard/tests/strings/nl2br_variation5.phpt @@ -8,7 +8,7 @@ Test nl2br() function : usage variations - unexpected values for 'str' argument */ /* -* Test nl2br() function by passing different types of values other than +* Test nl2br() function by passing different types of values other than * expected type for 'str' argument */ @@ -74,7 +74,7 @@ $values = array( @$unset_var, ); -// loop through $values array to test nl2br() function with each element +// loop through $values array to test nl2br() function with each element $count = 1; foreach($values as $value) { echo "-- Iteration $count --\n"; diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index b6f9fecc91..82fd6c0f95 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test nl_langinfo() function : basic functionality +Test nl_langinfo() function : basic functionality --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == 'WIN'){ diff --git a/ext/standard/tests/strings/nl_langinfo_error1.phpt b/ext/standard/tests/strings/nl_langinfo_error1.phpt index 0bfe2956cb..c8f3a284bf 100644 --- a/ext/standard/tests/strings/nl_langinfo_error1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test nl_langinfo() function : error conditions +Test nl_langinfo() function : error conditions --SKIPIF-- <?php if( substr(PHP_OS, 0, 3) == 'WIN'){ diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index 631bba0558..79ec7b85ac 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -18,7 +18,7 @@ $values = array(1234.5678, 02777777777, "123456789", "123.456789", - "12.3456789e1", + "12.3456789e1", null, true, false); diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt index c445be1e49..f49948206a 100644 --- a/ext/standard/tests/strings/ord_basic.phpt +++ b/ext/standard/tests/strings/ord_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ord() function : basic functionality +Test ord() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt index d72fb2624c..b3f2fe5cfc 100644 --- a/ext/standard/tests/strings/parse_str_basic1.phpt +++ b/ext/standard/tests/strings/parse_str_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test parse_str() function : basic functionality +Test parse_str() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt index 88a13ca387..32a8fcd3fc 100644 --- a/ext/standard/tests/strings/parse_str_basic2.phpt +++ b/ext/standard/tests/strings/parse_str_basic2.phpt @@ -1,7 +1,7 @@ --TEST-- Test parse_str() function : non-default arg_separator.input specified --INI-- -arg_separator.input = "/" +arg_separator.input = "/" --FILE-- <?php /* Prototype : void parse_str ( string $str [, array &$arr ] ) diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt Binary files differindex a38395b884..0368dea5f9 100644 --- a/ext/standard/tests/strings/parse_str_basic3.phpt +++ b/ext/standard/tests/strings/parse_str_basic3.phpt diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index a2402b7813..dcc3888e7e 100644 --- a/ext/standard/tests/strings/parse_str_error1.phpt +++ b/ext/standard/tests/strings/parse_str_error1.phpt @@ -1,7 +1,7 @@ --TEST-- Test parse_str() function : non-default arg_separator.input specified --INI-- -arg_separator.input = "/" +arg_separator.input = "/" --FILE-- <?php /* Prototype : void parse_str ( string $str [, array &$arr ] ) diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt index 27862c74e8..0b75641991 100644 --- a/ext/standard/tests/strings/print_basic.phpt +++ b/ext/standard/tests/strings/print_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test print() function : basic functionality +Test print() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 18ed423278..101d567749 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test print() function : usage variations +Test print() function : usage variations --FILE-- <?php diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt index d989d6a42a..eab44a4a65 100644 --- a/ext/standard/tests/strings/printf.phpt +++ b/ext/standard/tests/strings/printf.phpt @@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n"; printf("%%",1.23456789e10); echo"\n\n*** Output for precision value more than maximum ***\n"; -printf("%.988f",1.23456789e10); +printf("%.988f",1.23456789e10); echo"\n\n*** Output for invalid width(-15) specifier ***\n"; -printf("%030.-15s", $tempstring); +printf("%030.-15s", $tempstring); echo"\n\n*** Output for '%F' as the format parameter ***\n"; printf("%F",1.23456789e10); @@ -211,16 +211,16 @@ echo"\n\n*** Output with no format parameter ***\n"; printf($tempnum); echo"\n\n*** Output for multiple format parameters ***\n"; -printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); +printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); echo"\n\n*** Output for excess of mixed type arguments ***\n"; -printf("%s", $tempstring, $tempstring, $tempstring); +printf("%s", $tempstring, $tempstring, $tempstring); echo"\n\n*** Output for string format parameter and integer type argument ***\n"; -printf("%s", $tempnum); +printf("%s", $tempnum); echo"\n\n*** Output for integer format parameter and string type argument ***\n"; -printf("%d", $tempstring); +printf("%d", $tempstring); ?> diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt index d0b7aaff44..1a90970371 100644 --- a/ext/standard/tests/strings/printf_64bit.phpt +++ b/ext/standard/tests/strings/printf_64bit.phpt @@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n"; printf("%%",1.23456789e10); echo"\n\n*** Output for precision value more than maximum ***\n"; -printf("%.988f",1.23456789e10); +printf("%.988f",1.23456789e10); echo"\n\n*** Output for invalid width(-15) specifier ***\n"; -printf("%030.-15s", $tempstring); +printf("%030.-15s", $tempstring); echo"\n\n*** Output for '%F' as the format parameter ***\n"; printf("%F",1.23456789e10); @@ -211,16 +211,16 @@ echo"\n\n*** Output with no format parameter ***\n"; printf($tempnum); echo"\n\n*** Output for multiple format parameters ***\n"; -printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); +printf("%d %s %d\n", $tempnum, $tempstring, $tempnum); echo"\n\n*** Output for excess of mixed type arguments ***\n"; -printf("%s", $tempstring, $tempstring, $tempstring); +printf("%s", $tempstring, $tempstring, $tempstring); echo"\n\n*** Output for string format parameter and integer type argument ***\n"; -printf("%s", $tempnum); +printf("%s", $tempnum); echo"\n\n*** Output for integer format parameter and string type argument ***\n"; -printf("%d", $tempstring); +printf("%d", $tempstring); ?> diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt index 2e13f7ca16..bce0c4d0d7 100644 --- a/ext/standard/tests/strings/printf_error.phpt +++ b/ext/standard/tests/strings/printf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test printf() function : error conditions +Test printf() function : error conditions --FILE-- <?php /* Prototype : int printf ( string $format [, mixed $args [, mixed $... ]] ) diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 1720056912..654c418dc4 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quoted_printable_decode() function : basic functionality +Test quoted_printable_decode() function : basic functionality --FILE-- <?php /* Prototype : string quoted_printable_decode ( string $str ) diff --git a/ext/standard/tests/strings/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt index d823a89eaf..9008f5c861 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quoted_printable_decode() function : error conditions +Test quoted_printable_decode() function : error conditions --FILE-- <?php /* Prototype : string quoted_printable_decode ( string $str ) diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index 413ae21fd2..37081b3cf1 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test quotemeta() function : basic functionality +Test quotemeta() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt index 53661a8e70..dbbd6c6154 100644 --- a/ext/standard/tests/strings/rtrim_basic.phpt +++ b/ext/standard/tests/strings/rtrim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rtrim() function : basic functionality +Test rtrim() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/rtrim_error.phpt b/ext/standard/tests/strings/rtrim_error.phpt index 3cdfb9116d..108f96a1f0 100644 --- a/ext/standard/tests/strings/rtrim_error.phpt +++ b/ext/standard/tests/strings/rtrim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test rtrim() function : error conditions +Test rtrim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt index 6ecc72c116..08c4cf4424 100644 --- a/ext/standard/tests/strings/setlocale_basic1.phpt +++ b/ext/standard/tests/strings/setlocale_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test setlocale() function : basic functionality - setting system locale to a specific +Test setlocale() function : basic functionality - setting system locale to a specific --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -13,15 +13,15 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , - * or FALSE if locale functionality is not implemented in this platform. + * Description: Sets locale information.Returns the new current locale , + * or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ /* test setlocale by specifying a specific locale as input */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -79,18 +79,18 @@ $currency_symbol = array( // gather all the locales installed in the system $all_system_locales = list_system_locales(); -// set the system locale to a locale, choose the right locale by -// finding a common locale in commonly used locale stored in -// $common_locales & locales that are available in the system, stored -// in $all_system_locales. +// set the system locale to a locale, choose the right locale by +// finding a common locale in commonly used locale stored in +// $common_locales & locales that are available in the system, stored +// in $all_system_locales. echo "Setting system locale(LC_ALL) to "; foreach($common_locales as $value) { - // check if a commonly used locale is installed in the system + // check if a commonly used locale is installed in the system if(in_array($value, $all_system_locales)){ echo "$value\n"; // print, this is found // set the found locale as current locale var_dump(setlocale(LC_ALL, $value )); - // stop here + // stop here break; } else{ diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt index 4680941784..75ae1545d9 100644 --- a/ext/standard/tests/strings/setlocale_basic2.phpt +++ b/ext/standard/tests/strings/setlocale_basic2.phpt @@ -14,14 +14,14 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functionality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ /* Test the setlocale() when an array is provided as input containing list of locales */ /* Prototype : array list_system_locales( void ) - * Description: To get the currently installed locle in this platform + * Description: To get the currently installed locle in this platform * Arguments : Nil * Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and prepare a list of locales that can be used as +/* Collect existing system locales and prepare a list of locales that can be used as input to setlocale() */ echo "*** Testing setlocale() with an array containing list of locales ***\n"; @@ -91,7 +91,7 @@ foreach($common_locales as $value) { } } -// Now $list_of_locales array contains the locales that can be passed to +// Now $list_of_locales array contains the locales that can be passed to // setlocale() function. echo "-- Testing setlocale() : 'category' argument as LC_ALL & 'locale' argument as an array --\n"; if ( count($list_of_locales) > 0 ) { diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt index 997dad98e7..46beeda10e 100644 --- a/ext/standard/tests/strings/setlocale_basic3.phpt +++ b/ext/standard/tests/strings/setlocale_basic3.phpt @@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Test the setlocale() when multiple locales are provided as argument */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and get three locales that can be use to +/* Collect existing system locales and get three locales that can be use to pass as argument to setlocale() */ echo "*** Testing setlocale() by passing multiple locales as argument ***\n"; diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index 30f7d6cca0..14bb7d7ed5 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. + * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt index 04665b5455..6dc4179baf 100644 --- a/ext/standard/tests/strings/setlocale_variation1.phpt +++ b/ext/standard/tests/strings/setlocale_variation1.phpt @@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Test the setlocale() when multiple valid/invalid locales are provided as argument */ /* Prototype : array list_system_locales( void ) - Description: To get the currently installed locle in this platform + Description: To get the currently installed locle in this platform Arguments : Nil Returns : set of locale as array */ @@ -44,7 +44,7 @@ function list_system_locales() { return $system_locales; } -/* Collect existing system locales and get 2 valid locales that can be use to +/* Collect existing system locales and get 2 valid locales that can be use to pass as argument to setlocale(), pass 2 invalid arguments along with two valid arguments*/ echo "*** Testing setlocale() by passing multiple valid/invalid locales as argument ***\n"; diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index e138734920..fad3298cc7 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test setlocale() function : usage variations - Setting all available locales in the platform +Test setlocale() function : usage variations - Setting all available locales in the platform --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == 'WIN') { @@ -10,8 +10,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functionality is not implemented in this platform. + * Description: Sets locale information.Returns the new current locale , or FALSE + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ @@ -26,7 +26,7 @@ function good_locale($locale) { } /* Prototype : array list_system_locales( void ) - * Description: To get the currently installed locle in this platform + * Description: To get the currently installed locle in this platform * Arguments : Nil * Returns : set of locale as array */ @@ -52,7 +52,7 @@ function list_system_locales() { // gather all the locales installed in the system $all_system_locales = list_system_locales(); -//try different locale names +//try different locale names $failure_locale = array(); $success_count = 0; @@ -74,7 +74,7 @@ echo "No of locales found on the machine = ".count($all_system_locales)."\n"; echo "No of setlocale() success = ".$success_count."\n"; echo "Expected no of failures = 0\n"; echo "Test "; -// check if there were any failure of setlocale() function earlier, if any +// check if there were any failure of setlocale() function earlier, if any // failure then dump the list of failing locales if($success_count != count($all_system_locales)){ echo "FAILED\n"; diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index c68998fcfa..dcdab87bdc 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -14,7 +14,7 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) { /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt index d2bb0f13a6..68728206b7 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -16,7 +16,7 @@ LC_ALL=en_US.utf8; /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt index f17c7e42b8..0ba6d89024 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -15,8 +15,8 @@ LC_ALL=en_US.utf8; <?php /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); - * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functionality is not implemented in this platform. + * Description: Sets locale information.Returns the new current locale , or FALSE + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/sha1_error.phpt b/ext/standard/tests/strings/sha1_error.phpt index e666351d20..193c64e941 100644 --- a/ext/standard/tests/strings/sha1_error.phpt +++ b/ext/standard/tests/strings/sha1_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : error conditions +Test sha1() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index cb65572fcd..83a191b172 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -27,7 +27,7 @@ if (is_writable($filename)) { } } -// close the files +// close the files fclose($handle); fclose($handle2); diff --git a/ext/standard/tests/strings/sha1_variation1.phpt b/ext/standard/tests/strings/sha1_variation1.phpt index e473585989..35fb16a87b 100644 --- a/ext/standard/tests/strings/sha1_variation1.phpt +++ b/ext/standard/tests/strings/sha1_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : usage variations - unexpected values for 'str' argument +Test sha1() function : usage variations - unexpected values for 'str' argument --FILE-- <?php diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt index e7d8f01218..13c255451a 100644 --- a/ext/standard/tests/strings/sha1_variation2.phpt +++ b/ext/standard/tests/strings/sha1_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sha1() function : usage variations - unexpected values for 'raw' argument +Test sha1() function : usage variations - unexpected values for 'raw' argument --FILE-- <?php diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index c4c2bd83f2..4f21adf712 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments ***\n"; $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = 'baz'; } /* some code here */ - + show_source(__FILE__); ?> --EXPECT-- *** Test by calling method or function with its expected arguments *** <code><span style="color: #000000"> -<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /> <br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?><br /></span> +<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /><br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?><br /></span> </span> </code> diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index 568b842338..099dd233a1 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -9,13 +9,13 @@ echo "*** Test by calling method or function with its expected arguments and php $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } /* some code here */ -echo $baz; +echo $baz; show_source(__FILE__); echo $foo; ?> @@ -23,6 +23,6 @@ echo $foo; *** Test by calling method or function with its expected arguments and php output *** baz <code><span style="color: #000000"> -<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and php output ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /></span><span style="color: #007700">echo </span><span style="color: #0000BB">$baz</span><span style="color: #007700">; <br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br />echo </span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> +<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and php output ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /></span><span style="color: #007700">echo </span><span style="color: #0000BB">$baz</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br />echo </span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> </code>bar diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index 8224d0eee6..ca26ef29c9 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments and out $foo = 'bar'; $baz = "something ".$foo."\n"; -if ( $foo == 'bar' ) +if ( $foo == 'bar' ) { $baz = "baz\n"; } - /* some code here */ + /* some code here */ $source = show_source(__FILE__, true); var_dump($source); ?> --EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** -string(1987) "<code><span style="color: #000000"> -<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">) <br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */ <br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> +string(1975) "<code><span style="color: #000000"> +<span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> </span> </code>" diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt index 367ee60f15..401eb67460 100644 --- a/ext/standard/tests/strings/soundex_basic.phpt +++ b/ext/standard/tests/strings/soundex_basic.phpt @@ -24,7 +24,7 @@ var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222 var_dump(soundex("Lukasiewicz") == soundex("Ghosh")); var_dump(soundex("Hilbert") == soundex("Ladd")); -?> +?> ===DONE=== --EXPECT-- *** Testing soundex() : basic functionality *** @@ -42,5 +42,4 @@ bool(true) bool(true) bool(false) bool(false) - ===DONE=== diff --git a/ext/standard/tests/strings/soundex_error.phpt b/ext/standard/tests/strings/soundex_error.phpt index 20cf2c9d3e..8ff93b6d70 100644 --- a/ext/standard/tests/strings/soundex_error.phpt +++ b/ext/standard/tests/strings/soundex_error.phpt @@ -6,7 +6,7 @@ Test soundex() function : error conditions * Description: Calculate the soundex key of a string * Source code: ext/standard/string.c */ - + echo "\n*** Testing soundex error conditions ***"; echo "-- Testing soundex() function with Zero arguments --\n"; @@ -17,7 +17,7 @@ $str = "Euler"; $extra_arg = 10; var_dump( soundex( $str, $extra_arg) ); -?> +?> ===DONE=== --EXPECTF-- *** Testing soundex error conditions ***-- Testing soundex() function with Zero arguments -- @@ -30,5 +30,4 @@ NULL Warning: soundex() expects exactly 1 parameter, 2 given in %s on line %d NULL - -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index 18317373f4..b9327687e9 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic2.phpt b/ext/standard/tests/strings/sprintf_basic2.phpt index 16c035f34b..8d682ad9f9 100644 --- a/ext/standard/tests/strings/sprintf_basic2.phpt +++ b/ext/standard/tests/strings/sprintf_basic2.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic3.phpt b/ext/standard/tests/strings/sprintf_basic3.phpt index e6cd477bfa..343437615a 100644 --- a/ext/standard/tests/strings/sprintf_basic3.phpt +++ b/ext/standard/tests/strings/sprintf_basic3.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic4.phpt b/ext/standard/tests/strings/sprintf_basic4.phpt index 5dd5dd26b6..21a9ea280b 100644 --- a/ext/standard/tests/strings/sprintf_basic4.phpt +++ b/ext/standard/tests/strings/sprintf_basic4.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic5.phpt b/ext/standard/tests/strings/sprintf_basic5.phpt index 8ccb899b2f..85660544bc 100644 --- a/ext/standard/tests/strings/sprintf_basic5.phpt +++ b/ext/standard/tests/strings/sprintf_basic5.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic6.phpt b/ext/standard/tests/strings/sprintf_basic6.phpt index 882aacc107..913817015b 100644 --- a/ext/standard/tests/strings/sprintf_basic6.phpt +++ b/ext/standard/tests/strings/sprintf_basic6.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt index 9554ca1f59..0b3140dd0d 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt index b00c05bc8f..c3cd33656e 100644 --- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - unsigned format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt index 538122101d..f705e7bd1d 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt index 2facb3f896..ec4063eef7 100644 --- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_basic9.phpt b/ext/standard/tests/strings/sprintf_basic9.phpt index 9271bf92c9..53c8777cfd 100644 --- a/ext/standard/tests/strings/sprintf_basic9.phpt +++ b/ext/standard/tests/strings/sprintf_basic9.phpt @@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_error.phpt b/ext/standard/tests/strings/sprintf_error.phpt index bed1108118..1c12cd3168 100644 --- a/ext/standard/tests/strings/sprintf_error.phpt +++ b/ext/standard/tests/strings/sprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sprintf() function : error conditions +Test sprintf() function : error conditions --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index ef66b68117..f7bb9dec00 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unexpected values for format argume --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index 9bd1379589..c298b083bc 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt index 5a7d22d1bf..cb2a3a9cac 100644 --- a/ext/standard/tests/strings/sprintf_variation11.phpt +++ b/ext/standard/tests/strings/sprintf_variation11.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index ab3c3d34e1..b0fc221a0b 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -1,9 +1,9 @@ --TEST-- -Test sprintf() function : usage variations - float formats with arrays +Test sprintf() function : usage variations - float formats with arrays --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index 8d39fb9e62..de40856c36 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 7b34649426..7ee6f4a66e 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 1ec44a6d03..308bb7ebcc 100644 --- a/ext/standard/tests/strings/sprintf_variation15.phpt +++ b/ext/standard/tests/strings/sprintf_variation15.phpt diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index 48b3cda464..40c0e87d14 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( -2147483649, 2147483648, diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt index 649a1f5cd1..dc9bc8bcad 100644 --- a/ext/standard/tests/strings/sprintf_variation17.phpt +++ b/ext/standard/tests/strings/sprintf_variation17.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 8f702e08b9..009b45ef31 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index 5c7c8b620f..ede367bbff 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 858ae7402c..967949a09c 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with all types of values for arg1 a --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 5f44d6a42f..016e6c5bf1 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : string formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex 083f3827fe..30c0527277 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex ef92e521e8..0280a6a0e8 100644 --- a/ext/standard/tests/strings/sprintf_variation22.phpt +++ b/ext/standard/tests/strings/sprintf_variation22.phpt diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt index e0d247346f..fc3148c0be 100644 --- a/ext/standard/tests/strings/sprintf_variation23.phpt +++ b/ext/standard/tests/strings/sprintf_variation23.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - char formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 3d874b5cbd..b4e8f51e91 100644 --- a/ext/standard/tests/strings/sprintf_variation24.phpt +++ b/ext/standard/tests/strings/sprintf_variation24.phpt diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt Binary files differindex 1525a41cd5..1e81c7137a 100644 --- a/ext/standard/tests/strings/sprintf_variation25.phpt +++ b/ext/standard/tests/strings/sprintf_variation25.phpt diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt Binary files differindex 580796add0..0b1170142b 100644 --- a/ext/standard/tests/strings/sprintf_variation26.phpt +++ b/ext/standard/tests/strings/sprintf_variation26.phpt diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt Binary files differindex 01bb956384..b660334741 100644 --- a/ext/standard/tests/strings/sprintf_variation27.phpt +++ b/ext/standard/tests/strings/sprintf_variation27.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 3586c262df..747629f3f7 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index 6e0d8eae93..0fac9573be 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 2e686771ec..abb82415cc 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 0.0, -0.1, diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt index f758a673e4..8dc7a45d16 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 0.0, -0.1, diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 905507e7a2..c6fd878c1b 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt index 4f91ad57f4..d0beeb9501 100644 --- a/ext/standard/tests/strings/sprintf_variation30.phpt +++ b/ext/standard/tests/strings/sprintf_variation30.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - octal formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index 31f211c795..af285dab23 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with array values ***\n"; -// different arrays used to test the function +// different arrays used to test the function $array_values = array( array(), array(0), diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index e6ca521f72..03caa63493 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index 9b3e602a2f..b629dbabfe 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : octal formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index 0dd38448ec..81e79d0c02 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -31,9 +31,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index d5d8fe229d..27ef87796a 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with integer values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -27,9 +27,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index 56afca215d..2056f083cb 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt index 4a2c701acd..386a2b6b58 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int diff --git a/ext/standard/tests/strings/sprintf_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt index 1cebffe129..bf05a99db4 100644 --- a/ext/standard/tests/strings/sprintf_variation36.phpt +++ b/ext/standard/tests/strings/sprintf_variation36.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - hexa formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index 51fcaaa0d7..d474ee0e1a 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index 6b29c1fc09..5a34280b95 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index c799d169c2..f9d9dbe222 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : hexa formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 9ab493ff37..5345fd1088 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index da626a4d81..c6335ebb6a 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -31,9 +31,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index f887ff5afa..ae5928931a 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with integer value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -27,9 +27,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index a87c1dd33a..e888fac941 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt index 02991cf3ea..c976a7b799 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( 2147483647, 0x800000001, // float value, beyond max positive int diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt index 7f994e23d7..760c173a00 100644 --- a/ext/standard/tests/strings/sprintf_variation42.phpt +++ b/ext/standard/tests/strings/sprintf_variation42.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unsigned formats with resource valu --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index 4def644ace..ea34bc8813 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with array values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index f4023546ee..10c65a8d29 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) { --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt index 8aef09bdc9..24c80ded3b 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index a2a2f570f3..5cdf9da998 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with boolean value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : unsigned formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 79e2dff6f1..3ba8164f4a 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with integer val --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with integer values ***\n"; -// array of integer values +// array of integer values $integer_values = array( 0, 1, @@ -25,9 +25,9 @@ $integer_values = array( -0x80000000, // max negative integer as hexadecimal 0x7fffffff, // max positive integer as hexadecimal 0x7FFFFFFF, // max positive integer as hexadecimal - 0123, // integer as octal + 0123, // integer as octal 01, // should be quivalent to octal 1 - -020000000000, // max negative integer as octal + -020000000000, // max negative integer as octal 017777777777 // max positive integer as octal ); diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index a935885242..72212b6244 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with float value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with float values ***\n"; -// array of float values +// array of float values $float_values = array( -2147483649, 2147483648, diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt index b3eccf7e13..ac551a4453 100644 --- a/ext/standard/tests/strings/sprintf_variation48.phpt +++ b/ext/standard/tests/strings/sprintf_variation48.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - scientific formats with resource va --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index bbd3ce7e34..31177ef521 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with array value --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with array values ***\n"; -// array of array values +// array of array values $array_values = array( array(), array(0), diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt index 990c0b28d4..79aff1fc39 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -5,7 +5,7 @@ Test sprintf() function : usage variations - int formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt index 5fc863781a..4fc37435ef 100644 --- a/ext/standard/tests/strings/sprintf_variation5.phpt +++ b/ext/standard/tests/strings/sprintf_variation5.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with resource values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index bb4c96bb64..d4f55d47e1 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with string valu --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with string values ***\n"; -// array of string values +// array of string values $string_values = array( "", '', diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index ab245da1a1..0ee0c52c65 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with boolean val --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ echo "*** Testing sprintf() : scientific formats with boolean values ***\n"; -// array of boolean values +// array of boolean values $boolean_values = array( true, false, diff --git a/ext/standard/tests/strings/sprintf_variation52.phpt b/ext/standard/tests/strings/sprintf_variation52.phpt index 996434fef4..7817f77b2f 100644 --- a/ext/standard/tests/strings/sprintf_variation52.phpt +++ b/ext/standard/tests/strings/sprintf_variation52.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - typical format strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index 87c91389e6..2993dd00f1 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with whitespaces in format strings --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index 361570ea91..1bf35df284 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with arrays --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index 49bb8932a7..a37280df13 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with boolean values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 168f424a21..73efcc0583 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with string values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index 6629a34f80..f2564abd53 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt index 8d883a1f92..f2a3dcbfec 100644 --- a/ext/standard/tests/strings/sscanf_error.phpt +++ b/ext/standard/tests/strings/sscanf_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test sscanf() function : error conditions +Test sscanf() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt Binary files differindex 0c0c2026cd..b44a9517ab 100644 --- a/ext/standard/tests/strings/str_pad.phpt +++ b/ext/standard/tests/strings/str_pad.phpt diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index e694fa9db7..32506ab1a9 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$input' argu * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$input' +/* Test str_pad() function: with unexpected inputs for '$input' * and expected type for '$pad_length' */ diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt index ec0aa959af..114d5f5ba1 100644 --- a/ext/standard/tests/strings/str_pad_variation2.phpt +++ b/ext/standard/tests/strings/str_pad_variation2.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_length' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ diff --git a/ext/standard/tests/strings/str_pad_variation3.phpt b/ext/standard/tests/strings/str_pad_variation3.phpt index 1e924efe8a..1e58477f21 100644 --- a/ext/standard/tests/strings/str_pad_variation3.phpt +++ b/ext/standard/tests/strings/str_pad_variation3.phpt @@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_string' * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_string' +/* Test str_pad() function: with unexpected inputs for '$pad_string' * and expected type for '$input' and '$pad_length' */ diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt index b72ec20c02..22ca2d5270 100644 --- a/ext/standard/tests/strings/str_pad_variation4.phpt +++ b/ext/standard/tests/strings/str_pad_variation4.phpt @@ -9,7 +9,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_type' a * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_type' +/* Test str_pad() function: with unexpected inputs for '$pad_type' * and expected type for '$input', '$pad_length' and '$pad_string' */ diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt index f1f47b932c..8eade37df3 100644 --- a/ext/standard/tests/strings/str_pad_variation5.phpt +++ b/ext/standard/tests/strings/str_pad_variation5.phpt @@ -16,7 +16,7 @@ if (getenv("USE_ZEND_ALLOC") === "0") { * Source code: ext/standard/string.c */ -/* Test str_pad() function: with unexpected inputs for '$pad_length' +/* Test str_pad() function: with unexpected inputs for '$pad_length' * and expected type for '$input' */ diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex beb5e805f8..306b7d381a 100644 --- a/ext/standard/tests/strings/str_repeat.phpt +++ b/ext/standard/tests/strings/str_repeat.phpt diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index b53ed665d4..7b411abac5 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -4,10 +4,10 @@ Test str_replace() function precision=14 --FILE-- <?php -/* - Prototype: mixed str_replace(mixed $search, mixed $replace, +/* + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ @@ -27,13 +27,13 @@ var_dump( str_replace("long string here", "", "", $count) ); var_dump( $count ); $fp = fopen( __FILE__, "r" ); -$fp_copy = $fp; +$fp_copy = $fp; var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) ); var_dump( $fp_copy ); fclose($fp); echo "\n*** Testing str_replace() with various search values ***"; -$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, +$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); $i = 0; @@ -41,7 +41,7 @@ $i = 0; foreach( $search_arr as $value ) { echo "\n-- Iteration $i --\n"; /* replace the string in array */ - var_dump( str_replace($value, "FOUND", $search_arr, $count) ); + var_dump( str_replace($value, "FOUND", $search_arr, $count) ); var_dump( $count ); $i++; } @@ -52,7 +52,7 @@ $subject = "Hello, world,0120333.3445-1.234567 NULL TRUE FALSE\000 ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)"; /* needles in an array to be compared in the string $string */ -$search_str = array ( +$search_str = array ( "Hello, World", 'Hello, World', '!!Hello, World', @@ -97,20 +97,20 @@ for( $i = 0; $i < count($search_str); $i++ ) { var_dump( str_replace($search_str[$i], "FOUND", $subject, $count) ); echo "-- search string has found '$count' times\n"; } - + echo "\n*** Testing Miscelleneous input data ***\n"; -/* If replace has fewer values than search, then an empty +/* If replace has fewer values than search, then an empty string is used for the rest of replacement values */ -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), "aaabb", $count ) ); var_dump($count); -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), - array("aaa", "bbb", "ccc"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), + array("aaa", "bbb", "ccc"), $count ) ); @@ -122,7 +122,7 @@ echo "\n-- Testing objects --\n"; to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ -class subject +class subject { function __toString() { return "Hello, world"; @@ -130,7 +130,7 @@ class subject } $obj_subject = new subject; -class search +class search { function __toString() { return "Hello, world"; @@ -138,7 +138,7 @@ class search } $obj_search = new search; -class replace +class replace { function __toString() { return "Hello, world"; @@ -155,15 +155,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count)); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), + array("q", "q", "c"), "aaa", $count ) ); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), - array("aaa", "bbb"), + array("q", "q", "c"), + array("aaa", "bbb"), $count ) ); @@ -182,7 +182,7 @@ var_dump($count); echo "\n-- Testing Resources --\n"; $resource1 = fopen( __FILE__, "r" ); $resource2 = opendir( "." ); -var_dump(str_replace("stream", "FOUND", $resource1, $count)); +var_dump(str_replace("stream", "FOUND", $resource1, $count)); var_dump($count); var_dump(str_replace("stream", "FOUND", $resource2, $count)); var_dump($count); @@ -237,7 +237,7 @@ closedir($resource2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- *** Testing str_replace() on basic operations *** string(0) "" string(4) "tbst" diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt index a133fd8bd5..790a32fffd 100644 --- a/ext/standard/tests/strings/str_replace_basic.phpt +++ b/ext/standard/tests/strings/str_replace_basic.phpt @@ -5,9 +5,9 @@ precision=14 --FILE-- <?php /* - Prototype: mixed str_replace(mixed $search, mixed $replace, + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt index 38c62dc86c..b66fd8c9ec 100644 --- a/ext/standard/tests/strings/str_replace_error.phpt +++ b/ext/standard/tests/strings/str_replace_error.phpt @@ -5,9 +5,9 @@ precision=14 --FILE-- <?php /* - Prototype: mixed str_replace(mixed $search, mixed $replace, + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt index 0dddd2f5d8..067e26307d 100644 --- a/ext/standard/tests/strings/str_replace_variation1.phpt +++ b/ext/standard/tests/strings/str_replace_variation1.phpt @@ -5,15 +5,15 @@ precision=14 --FILE-- <?php /* - Prototype: mixed str_replace(mixed $search, mixed $replace, + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ echo "\n*** Testing str_replace() with various search values ***"; -$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, +$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, array(), "php", ""); $i = 0; diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex 5534341dcf..5cf7f7c014 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 1042bc3099..8ae709745f 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -5,25 +5,25 @@ precision=14 --FILE-- <?php /* - Prototype: mixed str_replace(mixed $search, mixed $replace, + Prototype: mixed str_replace(mixed $search, mixed $replace, mixed $subject [, int &$count]); - Description: Replace all occurrences of the search string with + Description: Replace all occurrences of the search string with the replacement string */ echo "\n*** Testing Miscelleneous input data ***\n"; -/* If replace has fewer values than search, then an empty +/* If replace has fewer values than search, then an empty string is used for the rest of replacement values */ -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), "aaabb", $count ) ); var_dump($count); -var_dump( str_replace(array("a", "a", "b"), - array("q", "q"), - array("aaa", "bbb", "ccc"), +var_dump( str_replace(array("a", "a", "b"), + array("q", "q"), + array("aaa", "bbb", "ccc"), $count ) ); @@ -35,7 +35,7 @@ echo "\n-- Testing objects --\n"; to string" by default, when an object is passed instead of string: The error can be avoided by choosing the __toString magix method as follows: */ -class subject +class subject { function __toString() { return "Hello, world"; @@ -43,7 +43,7 @@ class subject } $obj_subject = new subject; -class search +class search { function __toString() { return "Hello, world"; @@ -51,7 +51,7 @@ class search } $obj_search = new search; -class replace +class replace { function __toString() { return "Hello, world"; @@ -68,15 +68,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count)); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), + array("q", "q", "c"), "aaa", $count ) ); var_dump($count); var_dump(str_replace( array("a", "a", "b"), - array("q", "q", "c"), - array("aaa", "bbb"), + array("q", "q", "c"), + array("aaa", "bbb"), $count ) ); diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt index 063ea0199e..348f1bb731 100644 --- a/ext/standard/tests/strings/str_shuffle_basic.phpt +++ b/ext/standard/tests/strings/str_shuffle_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test str_shuffle() function : basic functionality +Test str_shuffle() function : basic functionality --FILE-- <?php /* Prototype : string str_shuffle ( string $str ) @@ -19,7 +19,7 @@ var_dump(str_shuffle($str)); // For a given i/p string ensure that all combinations are -// generated given a reasonable sample of calls +// generated given a reasonable sample of calls $a = array(); $trys = 1000; $ip = 'abcd'; @@ -34,7 +34,7 @@ for ($i = 0; $i < $trys; $i++) { // Combination already hit ? if (empty($a[$op])) { - // No first time init + // No first time init $a[$op] = 0; } diff --git a/ext/standard/tests/strings/str_shuffle_error.phpt b/ext/standard/tests/strings/str_shuffle_error.phpt index d8024290e0..8b83b5e2d0 100644 --- a/ext/standard/tests/strings/str_shuffle_error.phpt +++ b/ext/standard/tests/strings/str_shuffle_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test str_shuffle() function : error conditions +Test str_shuffle() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt index 72617cea9e..b9cc8068bc 100644 --- a/ext/standard/tests/strings/str_split_basic.phpt +++ b/ext/standard/tests/strings/str_split_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : basic functionality +Test str_split() function : basic functionality --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_error.phpt b/ext/standard/tests/strings/str_split_error.phpt index c7075ec0ce..1a4558e680 100644 --- a/ext/standard/tests/strings/str_split_error.phpt +++ b/ext/standard/tests/strings/str_split_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : error conditions +Test str_split() function : error conditions --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation1.phpt b/ext/standard/tests/strings/str_split_variation1.phpt index 46406f56a0..94eca406fd 100644 --- a/ext/standard/tests/strings/str_split_variation1.phpt +++ b/ext/standard/tests/strings/str_split_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : usage variations - unexpected values for 'str' argument +Test str_split() function : usage variations - unexpected values for 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt index ef2ea94a9e..0bb8304b56 100644 --- a/ext/standard/tests/strings/str_split_variation2.phpt +++ b/ext/standard/tests/strings/str_split_variation2.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation2_64bit.phpt b/ext/standard/tests/strings/str_split_variation2_64bit.phpt index d465e355d6..92a07498a4 100644 --- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt Binary files differindex cbdad94854..6c2a3c83f8 100644 --- a/ext/standard/tests/strings/str_split_variation3.phpt +++ b/ext/standard/tests/strings/str_split_variation3.phpt diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index 444384468a..caeba8a6f2 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -1,11 +1,11 @@ --TEST-- -Test str_split() function : usage variations - different single quoted strings for 'str' argument +Test str_split() function : usage variations - different single quoted strings for 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index b5a175757c..2f3f5a2f46 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -1,18 +1,18 @@ --TEST-- -Test str_split() function : usage variations - different heredoc strings as 'str' argument +Test str_split() function : usage variations - different heredoc strings as 'str' argument --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length] ) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ /* * Passing different heredoc strings as 'str' argument to the str_split() -* with 'split_length' 10 +* with 'split_length' 10 */ echo "*** Testing str_split() : heredoc strings as 'str' argument ***\n"; diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt index 95afb24e59..a477800a26 100644 --- a/ext/standard/tests/strings/str_split_variation6.phpt +++ b/ext/standard/tests/strings/str_split_variation6.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n //Initialise variables $str = 'This is a string with 123 & escape char \t'; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/str_split_variation6_64bit.phpt b/ext/standard/tests/strings/str_split_variation6_64bit.phpt index 39c3a85f0d..583c7db3cf 100644 --- a/ext/standard/tests/strings/str_split_variation6_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation6_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n //Initialise variables $str = 'This is a string with 123 & escape char \t'; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt index 0d34317245..5082c7ba2f 100644 --- a/ext/standard/tests/strings/str_split_variation7.phpt +++ b/ext/standard/tests/strings/str_split_variation7.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -24,7 +24,7 @@ $str = <<<EOT string with 123,escape char \t. EOT; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/str_split_variation7_64bit.phpt b/ext/standard/tests/strings/str_split_variation7_64bit.phpt index 1f324b2421..bff61adb30 100644 --- a/ext/standard/tests/strings/str_split_variation7_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation7_64bit.phpt @@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : array str_split(string $str [, int $split_length]) - * Description: Convert a string to an array. If split_length is - specified, break the string down into chunks each - split_length characters long. + * Description: Convert a string to an array. If split_length is + specified, break the string down into chunks each + split_length characters long. * Source code: ext/standard/string.c * Alias to functions: none */ @@ -24,7 +24,7 @@ $str = <<<EOT string with 123,escape char \t. EOT; -//different values for 'split_length' +//different values for 'split_length' $values = array ( 0, 1, diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt Binary files differindex 265b8708ea..9b1898fb35 100644 --- a/ext/standard/tests/strings/strcasecmp.phpt +++ b/ext/standard/tests/strings/strcasecmp.phpt diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt Binary files differindex dea94644aa..ef659014a5 100644 --- a/ext/standard/tests/strings/strcmp.phpt +++ b/ext/standard/tests/strings/strcmp.phpt diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index 01ec5ea321..d31756050c 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strcspn() function : basic functionality +Test strcspn() function : basic functionality --FILE-- <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) diff --git a/ext/standard/tests/strings/strcspn_error.phpt b/ext/standard/tests/strings/strcspn_error.phpt index 4b69063881..ebb7f9f0d0 100644 --- a/ext/standard/tests/strings/strcspn_error.phpt +++ b/ext/standard/tests/strings/strcspn_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strcspn() function : error conditions +Test strcspn() function : error conditions --FILE-- <?php /* Prototype : proto int strcspn(string str, string mask [, int start [, int len]]) diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt Binary files differindex 9b40bad2d7..e6fcae9220 100644 --- a/ext/standard/tests/strings/strcspn_variation5.phpt +++ b/ext/standard/tests/strings/strcspn_variation5.phpt diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt Binary files differindex d235dc4d19..632aaa4b5d 100644 --- a/ext/standard/tests/strings/strcspn_variation9.phpt +++ b/ext/standard/tests/strings/strcspn_variation9.phpt diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 05380ddff5..164cf50452 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -5,13 +5,13 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ echo "*** Testing strip_tags() : basic functionality ***\n"; -// array of arguments +// array of arguments $string_array = array ( "<html>hello</html>", '<html>hello</html>', diff --git a/ext/standard/tests/strings/strip_tags_error.phpt b/ext/standard/tests/strings/strip_tags_error.phpt index c45cbb115a..25f703c3c0 100644 --- a/ext/standard/tests/strings/strip_tags_error.phpt +++ b/ext/standard/tests/strings/strip_tags_error.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt index c02027d5df..5c7fd642ad 100644 --- a/ext/standard/tests/strings/strip_tags_variation1.phpt +++ b/ext/standard/tests/strings/strip_tags_variation1.phpt @@ -5,7 +5,7 @@ set short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 3c6200ee48..63d579f4ad 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -7,7 +7,7 @@ short_open_tag = on echo "*** Testing strip_tags() : obscure functionality ***\n"; -// array of arguments +// array of arguments $string_array = array ( 'hello <img title="<"> world', 'hello <img title=">"> world', diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt index c0a6e92423..a32e3eccad 100644 --- a/ext/standard/tests/strings/strip_tags_variation2.phpt +++ b/ext/standard/tests/strings/strip_tags_variation2.phpt @@ -5,7 +5,7 @@ short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strip_tags_variation3.phpt b/ext/standard/tests/strings/strip_tags_variation3.phpt index 5b7c50422e..2117c1306c 100644 --- a/ext/standard/tests/strings/strip_tags_variation3.phpt +++ b/ext/standard/tests/strings/strip_tags_variation3.phpt @@ -5,7 +5,7 @@ set short_open_tag = on --FILE-- <?php /* Prototype : string strip_tags(string $str [, string $allowable_tags]) - * Description: Strips HTML and PHP tags from a string + * Description: Strips HTML and PHP tags from a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt index af289f7793..24a23810d5 100644 --- a/ext/standard/tests/strings/stripcslashes_basic.phpt +++ b/ext/standard/tests/strings/stripcslashes_basic.phpt @@ -1,10 +1,10 @@ --TEST-- -Test stripcslashes() function : basic functionality +Test stripcslashes() function : basic functionality --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/stripcslashes_error.phpt b/ext/standard/tests/strings/stripcslashes_error.phpt index 78103ec31d..174da56443 100644 --- a/ext/standard/tests/strings/stripcslashes_error.phpt +++ b/ext/standard/tests/strings/stripcslashes_error.phpt @@ -1,10 +1,10 @@ --TEST-- -Test stripcslashes() function : error conditions +Test stripcslashes() function : error conditions --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt index d08082e302..fe3a786678 100644 --- a/ext/standard/tests/strings/stripcslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt @@ -1,15 +1,15 @@ --TEST-- -Test stripcslashes() function : usage variations - non-string type argument +Test stripcslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string stripcslashes ( string $str ) - * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., + * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., * octal and hexadecimal representation. * Source code: ext/standard/string.c */ /* - * Test stripcslashes() with non-string type argument such as int, float, etc + * Test stripcslashes() with non-string type argument such as int, float, etc */ echo "*** Testing stripcslashes() : with non-string type argument ***\n"; diff --git a/ext/standard/tests/strings/stripos_error.phpt b/ext/standard/tests/strings/stripos_error.phpt index c59473046d..324014cf6d 100644 --- a/ext/standard/tests/strings/stripos_error.phpt +++ b/ext/standard/tests/strings/stripos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripos() function : error conditions +Test stripos() function : error conditions --FILE-- <?php /* Prototype : int stripos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt index 409c041dbd..81b8f5adb1 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - unexpected inputs for 'needle' argu * Source code: ext/standard/string.c */ -/* Test stripos() function with unexpected inputs for 'needle' and - * an expected type of input for 'haystack' argument +/* Test stripos() function with unexpected inputs for 'needle' and + * an expected type of input for 'haystack' argument */ echo "*** Testing stripos() function with unexpected values for needle ***\n"; diff --git a/ext/standard/tests/strings/stripos_variation12.phpt b/ext/standard/tests/strings/stripos_variation12.phpt index 1e09b044ca..cc419787d6 100644 --- a/ext/standard/tests/strings/stripos_variation12.phpt +++ b/ext/standard/tests/strings/stripos_variation12.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'haysta * Source code: ext/standard/string.c */ -/* Test stripos() function with null terminated strings for 'haystack' argument - * in order to check the binary safe +/* Test stripos() function with null terminated strings for 'haystack' argument + * in order to check the binary safe */ echo "*** Test stripos() function: binary safe ***\n"; diff --git a/ext/standard/tests/strings/stripos_variation13.phpt b/ext/standard/tests/strings/stripos_variation13.phpt index 694827051f..a641489755 100644 --- a/ext/standard/tests/strings/stripos_variation13.phpt +++ b/ext/standard/tests/strings/stripos_variation13.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'needle * Source code: ext/standard/string.c */ -/* Test stripos() function with null terminated strings for 'needle' argument - * in order to check binary safe +/* Test stripos() function with null terminated strings for 'needle' argument + * in order to check binary safe */ echo "*** Test stripos() function: binary safe ***\n"; diff --git a/ext/standard/tests/strings/stripos_variation3.phpt b/ext/standard/tests/strings/stripos_variation3.phpt index fc678a7267..936f870579 100644 --- a/ext/standard/tests/strings/stripos_variation3.phpt +++ b/ext/standard/tests/strings/stripos_variation3.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - multi line heredoc string for 'hays * Source code: ext/standard/string.c */ -/* Test stripos() function by passing multi-line heredoc string for haystack and +/* Test stripos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/stripos_variation4.phpt b/ext/standard/tests/strings/stripos_variation4.phpt index 5c4028ec45..98e2d25c44 100644 --- a/ext/standard/tests/strings/stripos_variation4.phpt +++ b/ext/standard/tests/strings/stripos_variation4.phpt @@ -8,7 +8,7 @@ Test stripos() function : usage variations - heredoc string containing special c */ /* Test stripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing stripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/stripos_variation5.phpt b/ext/standard/tests/strings/stripos_variation5.phpt index 8cfc3f9194..095937fabf 100644 --- a/ext/standard/tests/strings/stripos_variation5.phpt +++ b/ext/standard/tests/strings/stripos_variation5.phpt @@ -7,8 +7,8 @@ Test stripos() function : usage variations - heredoc string containing escape ch * Source code: ext/standard/string.c */ -/* Test stripos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test stripos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing stripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/stripos_variation6.phpt b/ext/standard/tests/strings/stripos_variation6.phpt index 151b145229..fc441e1088 100644 --- a/ext/standard/tests/strings/stripos_variation6.phpt +++ b/ext/standard/tests/strings/stripos_variation6.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - heredoc string containing quotes fo * Source code: ext/standard/string.c */ -/* Test stripos() function by passing heredoc string containing quotes for haystack +/* Test stripos() function by passing heredoc string containing quotes for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/stripos_variation7.phpt b/ext/standard/tests/strings/stripos_variation7.phpt index 29a0a20469..04c636365f 100644 --- a/ext/standard/tests/strings/stripos_variation7.phpt +++ b/ext/standard/tests/strings/stripos_variation7.phpt @@ -7,7 +7,7 @@ Test stripos() function : usage variations - empty heredoc string for 'haystack' * Source code: ext/standard/string.c */ -/* Test stripos() function by passing empty heredoc string for haystack +/* Test stripos() function by passing empty heredoc string for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt index a0ae75dd1f..41ff384c38 100644 --- a/ext/standard/tests/strings/stripos_variation8.phpt +++ b/ext/standard/tests/strings/stripos_variation8.phpt @@ -8,7 +8,7 @@ Test stripos() function : usage variations - repetitive chars for 'haystack' arg */ /* Test stripos() function with strings containing repetitive chars for haystak - * and with various needles & offsets + * and with various needles & offsets */ echo "*** Testing stripos() function: strings repetitive chars ***\n"; diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex c7027e932f..3286765b3a 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/stripslashes_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt index 99d877fd69..81b9889fc4 100644 --- a/ext/standard/tests/strings/stripslashes_error.phpt +++ b/ext/standard/tests/strings/stripslashes_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripslashes() function : error conditions +Test stripslashes() function : error conditions --FILE-- <?php /* Prototype : string stripslashes ( string $str ) diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt index 6f2e928cd5..2f9239ceee 100644 --- a/ext/standard/tests/strings/stripslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripslashes_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stripslashes() function : usage variations - non-string type argument +Test stripslashes() function : usage variations - non-string type argument --FILE-- <?php /* Prototype : string stripslashes ( string $str ) @@ -8,7 +8,7 @@ Test stripslashes() function : usage variations - non-string type argument */ /* - * Test stripslashes() with non-string type argument such as int, float, etc + * Test stripslashes() with non-string type argument such as int, float, etc */ echo "*** Testing stripslashes() : with non-string type argument ***\n"; diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt Binary files differindex c3c58f9c42..e8edf4cd4b 100644 --- a/ext/standard/tests/strings/stripslashes_variation2.phpt +++ b/ext/standard/tests/strings/stripslashes_variation2.phpt diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 274438a86e..73cbbbe17d 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stristr() function : basic functionality +Test stristr() function : basic functionality --FILE-- <?php /* Prototype: string stristr ( string $haystack , mixed $needle [, bool $before_needle ] ) diff --git a/ext/standard/tests/strings/stristr_error.phpt b/ext/standard/tests/strings/stristr_error.phpt index 2da35de735..a0057574f9 100644 --- a/ext/standard/tests/strings/stristr_error.phpt +++ b/ext/standard/tests/strings/stristr_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test stristr() function : error conditions +Test stristr() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt Binary files differindex 52e0200af1..8e6f857b74 100644 --- a/ext/standard/tests/strings/strlen.phpt +++ b/ext/standard/tests/strings/strlen.phpt diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index 9e2605a670..721e4f1d26 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strlen() function : basic functionality +Test strlen() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/strlen_error.phpt b/ext/standard/tests/strings/strlen_error.phpt index 552e7c1ca6..d893936de3 100644 --- a/ext/standard/tests/strings/strlen_error.phpt +++ b/ext/standard/tests/strings/strlen_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strlen() function : error conditions +Test strlen() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/strnatcasecmp_basic.phpt b/ext/standard/tests/strings/strnatcasecmp_basic.phpt index da71edf79c..5b58e2331e 100644 --- a/ext/standard/tests/strings/strnatcasecmp_basic.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test strnatcasecmp() function : basic functionality +Test strnatcasecmp() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- <?php /* Prototype : int strnatcasecmp(string s1, string s2) - * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm + * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt index 3085e8d8fd..2105904aac 100644 --- a/ext/standard/tests/strings/strnatcasecmp_error.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strnatcasecmp() function : error conditions +Test strnatcasecmp() function : error conditions --FILE-- <?php /* Prototype : int strnatcasecmp ( string $str1 , string $str2 ) diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt index a2f7ad38ca..ac2cbb69f9 100644 --- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test strnatcasecmp() function : variation +Test strnatcasecmp() function : variation --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- <?php /* Prototype : int strnatcasecmp(string s1, string s2) - * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm + * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/strncasecmp_basic.phpt b/ext/standard/tests/strings/strncasecmp_basic.phpt index 34a1b08dc4..c021483359 100644 --- a/ext/standard/tests/strings/strncasecmp_basic.phpt +++ b/ext/standard/tests/strings/strncasecmp_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncasecmp() function : basic functionality +Test strncasecmp() function : basic functionality --FILE-- <?php /* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncasecmp_error.phpt b/ext/standard/tests/strings/strncasecmp_error.phpt index 7b2d19e616..d443f8113b 100644 --- a/ext/standard/tests/strings/strncasecmp_error.phpt +++ b/ext/standard/tests/strings/strncasecmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncasecmp() function : error conditions +Test strncasecmp() function : error conditions --FILE-- <?php /* Prototype : int strncasecmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt index 8eb03ee518..1c5708ae69 100644 --- a/ext/standard/tests/strings/strncasecmp_variation10.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt index d382df0a8e..362bbf1167 100644 --- a/ext/standard/tests/strings/strncasecmp_variation11.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index bc680caa31..93968db2da 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -77,7 +77,7 @@ $values = array ( @$unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strncmp_basic.phpt b/ext/standard/tests/strings/strncmp_basic.phpt index 317039859f..a836e591a5 100644 --- a/ext/standard/tests/strings/strncmp_basic.phpt +++ b/ext/standard/tests/strings/strncmp_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function : basic functionality +Test strncmp() function : basic functionality --FILE-- <?php /* Prototype : int strncmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncmp_error.phpt b/ext/standard/tests/strings/strncmp_error.phpt index 8e4d2805eb..4eb73eb318 100644 --- a/ext/standard/tests/strings/strncmp_error.phpt +++ b/ext/standard/tests/strings/strncmp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function : error conditions +Test strncmp() function : error conditions --FILE-- <?php /* Prototype : int strncmp ( string $str1, string $str2, int $len ); diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 9958abcaec..5e96e5d16f 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -77,7 +77,7 @@ $values = array ( $unset_var, /* resource */ - $file_handle, + $file_handle, /* object */ new sample() diff --git a/ext/standard/tests/strings/strpbrk_basic.phpt b/ext/standard/tests/strings/strpbrk_basic.phpt index 7cc36bec7e..9a92b8b4b5 100644 --- a/ext/standard/tests/strings/strpbrk_basic.phpt +++ b/ext/standard/tests/strings/strpbrk_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strpbrk() function : basic functionality +Test strpbrk() function : basic functionality --FILE-- <?php /* Prototype : array strpbrk(string haystack, string char_list) - * Description: Search a string for any of a set of characters + * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt index 009aac699a..658e2f429e 100644 --- a/ext/standard/tests/strings/strpbrk_error.phpt +++ b/ext/standard/tests/strings/strpbrk_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strpbrk() function : error conditions +Test strpbrk() function : error conditions --FILE-- <?php /* Prototype : array strpbrk(string haystack, string char_list) - * Description: Search a string for any of a set of characters + * Description: Search a string for any of a set of characters * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex c9c3453588..578539804d 100644 --- a/ext/standard/tests/strings/strpos.phpt +++ b/ext/standard/tests/strings/strpos.phpt diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index 5a2f86619c..822a755322 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrchr() function : basic functionality +Test strrchr() function : basic functionality --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); diff --git a/ext/standard/tests/strings/strrchr_error.phpt b/ext/standard/tests/strings/strrchr_error.phpt index aa0adf4b85..de5a9d34de 100644 --- a/ext/standard/tests/strings/strrchr_error.phpt +++ b/ext/standard/tests/strings/strrchr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrchr() function : error conditions +Test strrchr() function : error conditions --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); - * Description: Finds the last occurrence of a character in a string. + * Description: Finds the last occurrence of a character in a string. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 7a8b3c9756..6b46273836 100644 --- a/ext/standard/tests/strings/strrchr_variation1.phpt +++ b/ext/standard/tests/strings/strrchr_variation1.phpt diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 35ca3c6330..7b106a1c2a 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrchr() function : usage variations - unexpected inputs for needle +Test strrchr() function : usage variations - unexpected inputs for needle --FILE-- <?php /* Prototype : string strrchr(string $haystack, string $needle); @@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for needle * Source code: ext/standard/string.c */ -/* Test strrchr() function: with unexpected inputs for needle - * and expected type for haystack +/* Test strrchr() function: with unexpected inputs for needle + * and expected type for haystack */ echo "*** Testing strrchr() function with unexpected inputs for needle ***\n"; diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index be4a95468d..a9695fad6f 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -22,7 +22,7 @@ $needles = array( "ing", "", " ", - $multi_line_str //needle as haystack + $multi_line_str //needle as haystack ); //loop through to test strrchr() with each needle diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt index 8c385e5cb8..1bef8a9512 100644 --- a/ext/standard/tests/strings/strrchr_variation4.phpt +++ b/ext/standard/tests/strings/strrchr_variation4.phpt @@ -8,7 +8,7 @@ Test strrchr() function : usage variations - heredoc string containing special c */ /* Test strrchr() function by passing heredoc string containing special chars for haystack - * and with various needles + * and with various needles */ echo "*** Testing strrchr() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index 6d768e06bb..0d67fda06d 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing escape se * Source code: ext/standard/string.c */ -/* Test strrchr() function by passing heredoc string containing +/* Test strrchr() function by passing heredoc string containing * escape sequences for haystack and with various needles */ diff --git a/ext/standard/tests/strings/strrchr_variation7.phpt b/ext/standard/tests/strings/strrchr_variation7.phpt index d60b2e6711..bd58189c20 100644 --- a/ext/standard/tests/strings/strrchr_variation7.phpt +++ b/ext/standard/tests/strings/strrchr_variation7.phpt @@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing blank lin * Source code: ext/standard/string.c */ -/* Test strrchr() function by passing heredoc string containing +/* Test strrchr() function by passing heredoc string containing * blank-line for haystack and with various needles */ diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt index 1a86ba0cb1..760bfa6067 100644 --- a/ext/standard/tests/strings/strrchr_variation9.phpt +++ b/ext/standard/tests/strings/strrchr_variation9.phpt @@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for haystack * Source code: ext/standard/string.c */ -/* Test strrchr() function with unexpected inputs for haystack - * and expected type for 'needle' +/* Test strrchr() function with unexpected inputs for haystack + * and expected type for 'needle' */ echo "*** Testing strrchr() function: with unexpected inputs for haystack ***\n"; diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt index 390b78648b..64687272c0 100644 --- a/ext/standard/tests/strings/strrev_basic.phpt +++ b/ext/standard/tests/strings/strrev_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrev() function : basic functionality +Test strrev() function : basic functionality --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strrev_error.phpt b/ext/standard/tests/strings/strrev_error.phpt index ef64e80afd..2bc8a228ef 100644 --- a/ext/standard/tests/strings/strrev_error.phpt +++ b/ext/standard/tests/strings/strrev_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strrev() function : error conditions +Test strrev() function : error conditions --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt Binary files differindex ce0588d750..b13579f20b 100644 --- a/ext/standard/tests/strings/strrev_variation1.phpt +++ b/ext/standard/tests/strings/strrev_variation1.phpt diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt Binary files differindex 87c64ec794..d8ddda476c 100644 --- a/ext/standard/tests/strings/strrev_variation2.phpt +++ b/ext/standard/tests/strings/strrev_variation2.phpt diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt Binary files differindex af1d276ea6..6648c1b7fc 100644 --- a/ext/standard/tests/strings/strrev_variation3.phpt +++ b/ext/standard/tests/strings/strrev_variation3.phpt diff --git a/ext/standard/tests/strings/strrev_variation4.phpt b/ext/standard/tests/strings/strrev_variation4.phpt index fa347cd2fd..b585035c11 100644 --- a/ext/standard/tests/strings/strrev_variation4.phpt +++ b/ext/standard/tests/strings/strrev_variation4.phpt @@ -3,7 +3,7 @@ Test strrev() function : usage variations - unexpected inputs --FILE-- <?php /* Prototype : string strrev(string $str); - * Description: Reverse a string + * Description: Reverse a string * Source code: ext/standard/string.c */ @@ -17,7 +17,7 @@ class sample { } } -//get the resource +//get the resource $resource = fopen(__FILE__, "r"); //get an unset variable diff --git a/ext/standard/tests/strings/strripos_error.phpt b/ext/standard/tests/strings/strripos_error.phpt index 59d592681a..97445f0c86 100644 --- a/ext/standard/tests/strings/strripos_error.phpt +++ b/ext/standard/tests/strings/strripos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strripos() function : error conditions +Test strripos() function : error conditions --FILE-- <?php /* Prototype : int strripos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index 0495f6c5f2..5a8f7332bb 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -33,7 +33,7 @@ $needles = array( null, //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, //empty string @@ -53,13 +53,13 @@ $needles = array( "@", "@hEllo", -/*29*/ "12345", //decimal numeric string +/*29*/ "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index 4222b06855..866a75dfc2 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -33,7 +33,7 @@ $needles = array( null, //boolean false -/*14*/ FALSE, +/*14*/ FALSE, false, //empty string @@ -53,14 +53,14 @@ $needles = array( '@', '@hEllo', -/*29*/ '12345', //decimal numeric string +/*29*/ '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //respective ASCII char of \x23 '\101', //octal numeric string 'A', // respective ASCII char for \101 '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strripos_variation3.phpt b/ext/standard/tests/strings/strripos_variation3.phpt index c380106341..4fccaeb47e 100644 --- a/ext/standard/tests/strings/strripos_variation3.phpt +++ b/ext/standard/tests/strings/strripos_variation3.phpt @@ -7,7 +7,7 @@ Test strripos() function : usage variations - multi line heredoc string for 'hay * Source code: ext/standard/string.c */ -/* Test strripos() function by passing multi-line heredoc string for haystack and +/* Test strripos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index ef872d7c76..3583f3646c 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -8,7 +8,7 @@ Test strripos() function : usage variations - heredoc string containing special */ /* Test strripos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 7530a9f446..677e108e33 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -7,8 +7,8 @@ Test strripos() function : usage variations - heredoc string containing escape c * Source code: ext/standard/string.c */ -/* Test strripos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strripos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strripos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_error.phpt b/ext/standard/tests/strings/strrpos_error.phpt index 3900ceaa5d..d97af99920 100644 --- a/ext/standard/tests/strings/strrpos_error.phpt +++ b/ext/standard/tests/strings/strrpos_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strrpos() function : error conditions +Test strrpos() function : error conditions --FILE-- <?php /* Prototype : int strrpos ( string $haystack, string $needle [, int $offset] ); diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index ceb49df819..4d23db75da 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -33,7 +33,7 @@ $needle = array( null, //boolean false - FALSE, + FALSE, false, //empty string @@ -53,13 +53,13 @@ $needle = array( "@", "@hEllo", - "12345", //decimal numeric string + "12345", //decimal numeric string "\x23", //hexadecimal numeric string "#", //respective ASCII char of \x23 "\101", //octal numeric string "A", //respective ASCII char of \101 "456HEE", //numerics + chars - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index c2e78f15cd..32980450b2 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - unexpected inputs for 'needle' argu * Source code: ext/standard/string.c */ -/* Test strrpos() function with unexpected inputs for 'needle' and - * an expected type of input for 'haystack' argument +/* Test strrpos() function with unexpected inputs for 'needle' and + * an expected type of input for 'haystack' argument */ echo "*** Testing strrpos() function with unexpected values for needle ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt index b46f2e98ef..8f9946faf3 100644 --- a/ext/standard/tests/strings/strrpos_variation12.phpt +++ b/ext/standard/tests/strings/strrpos_variation12.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking binary safe with 'haystack * Source code: ext/standard/string.c */ -/* Test strrpos() function with null terminated strings for 'haystack' argument - * in order to check the binary safe +/* Test strrpos() function with null terminated strings for 'haystack' argument + * in order to check the binary safe */ echo "*** Test strrpos() function: binary safe ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt index 2772a2315a..bb8258ea0c 100644 --- a/ext/standard/tests/strings/strrpos_variation13.phpt +++ b/ext/standard/tests/strings/strrpos_variation13.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking bianry safe with 'needle' * Source code: ext/standard/string.c */ -/* Test strrpos() function with null terminated strings for 'needle' argument - * in order to check binary safe +/* Test strrpos() function with null terminated strings for 'needle' argument + * in order to check binary safe */ echo "*** Test strrpos() function: binary safe ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 7027c069c7..2ab0aa76b9 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -33,7 +33,7 @@ $needle = array( null, //boolean false - FALSE, + FALSE, false, //empty string @@ -53,14 +53,14 @@ $needle = array( '@', '@hEllo', - '12345', //decimal numeric string + '12345', //decimal numeric string '\x23', //hexadecimal numeric string '#', //hexadecimal numeric string '\101', //octal numeric string 'A', '456HEE', //numerics + chars 42, //needle as int(ASCII value of '*') - $haystack //haystack as needle + $haystack //haystack as needle ); /* loop through to get the position of the needle in haystack string */ diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index a920225947..6599c7167c 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - multi line heredoc string for 'hays * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing multi-line heredoc string for haystack and +/* Test strrpos() function by passing multi-line heredoc string for haystack and * with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index 40ac17affe..1e07fd9b5b 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - heredoc string containing special c */ /* Test strrpos() function by passing heredoc string containing special chars for haystack - * and with various needles & offets + * and with various needles & offets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index 0d985d86b4..46a727516f 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -7,8 +7,8 @@ Test strrpos() function : usage variations - heredoc string containing escape ch * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing escape chars for haystack - * and with various needles & offsets +/* Test strrpos() function by passing heredoc string containing escape chars for haystack + * and with various needles & offsets */ echo "*** Testing strrpos() function: with heredoc strings ***\n"; diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index ba5c5a1a40..cc961f75b0 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - heredoc string containing quotes fo * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing heredoc string containing quotes for haystack +/* Test strrpos() function by passing heredoc string containing quotes for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index a6318add96..8481191e7a 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -7,7 +7,7 @@ Test strrpos() function : usage variations - empty heredoc string for 'haystack' * Source code: ext/standard/string.c */ -/* Test strrpos() function by passing empty heredoc string for haystack +/* Test strrpos() function by passing empty heredoc string for haystack * and with various needles & offsets */ diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index d69e49f1d4..fe4706ca24 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -8,7 +8,7 @@ Test strrpos() function : usage variations - repetitive chars for 'haystack' arg */ /* Test strrpos() function with strings containing multiple occurrences of 'needle' in the 'haystack' - * and with various needles & offsets + * and with various needles & offsets */ echo "*** Testing strrpos() function: strings repetitive chars ***\n"; diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index 2da0f528e3..44eddff3cb 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strspn() function : basic functionality +Test strspn() function : basic functionality --FILE-- <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) diff --git a/ext/standard/tests/strings/strspn_error.phpt b/ext/standard/tests/strings/strspn_error.phpt index 494bcd6a05..0cf88c25d2 100644 --- a/ext/standard/tests/strings/strspn_error.phpt +++ b/ext/standard/tests/strings/strspn_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strspn() function : error conditions +Test strspn() function : error conditions --FILE-- <?php /* Prototype : proto int strspn(string str, string mask [, int start [, int len]]) diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index 41dd46e4f6..bc21ce6523 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -51,7 +51,7 @@ $mask_array = array( "fhel\t\i\100\xa" ); -// defining the array for start values +// defining the array for start values $start_array = array( 0, 1, diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index c8dd29f214..8086c53f66 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -42,7 +42,7 @@ $mask_array = array( "fhel\t\i\100\xa" ); -// defining the array for start values +// defining the array for start values $start_array = array( 0, 1, diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 04ac841ef7..eccf5dff34 100644 --- a/ext/standard/tests/strings/strspn_variation5.phpt +++ b/ext/standard/tests/strings/strspn_variation5.phpt diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt Binary files differindex 5ec2330e25..0835047ff5 100644 --- a/ext/standard/tests/strings/strspn_variation9.phpt +++ b/ext/standard/tests/strings/strspn_variation9.phpt diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex f746b03079..3cff71936e 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 3cb687295e..f0774c8644 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strtok() function : basic functionality +Test strtok() function : basic functionality --FILE-- <?php /* Prototype : string strtok ( str $str, str $token ) diff --git a/ext/standard/tests/strings/strtok_error.phpt b/ext/standard/tests/strings/strtok_error.phpt index b05a86c5fd..b54fbbe19b 100644 --- a/ext/standard/tests/strings/strtok_error.phpt +++ b/ext/standard/tests/strings/strtok_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strtok() function : error conditions +Test strtok() function : error conditions --FILE-- <?php /* Prototype : string strtok ( string $str, string $token ) @@ -26,7 +26,7 @@ $extra_arg = 10; var_dump( strtok($str, $token, $extra_arg) ); var_dump( $str ); -// Less than expected number of arguments +// Less than expected number of arguments echo "\n-- Testing strtok() with less than expected no. of arguments --\n"; $str = 'string val'; diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt index 7f7713c422..9c46428a65 100644 --- a/ext/standard/tests/strings/strtok_variation1.phpt +++ b/ext/standard/tests/strings/strtok_variation1.phpt @@ -94,7 +94,7 @@ for($index = 0; $index < count($values); $index ++) { $counter ++; } -//closing the resource +//closing the resource fclose($file_handle); echo "Done\n"; diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 16b64c876c..cd7f3b3041 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -25,7 +25,7 @@ $token_array = array( "/ ", "/k", "\k", - "\\\\\\\k\h\\e\l\o\w\r\l\d" + "\\\\\\\k\h\\e\l\o\w\r\l\d" ); // loop through each element of the array and check the working of strtok() diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt Binary files differindex ffaa1487ba..c0ad1d0115 100644 --- a/ext/standard/tests/strings/strtolower-win32.phpt +++ b/ext/standard/tests/strings/strtolower-win32.phpt diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt Binary files differindex 166b5ccc67..47dfe09762 100644 --- a/ext/standard/tests/strings/strtolower.phpt +++ b/ext/standard/tests/strings/strtolower.phpt diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt Binary files differindex e0adc645e0..60701652e1 100644 --- a/ext/standard/tests/strings/strtoupper1-win32.phpt +++ b/ext/standard/tests/strings/strtoupper1-win32.phpt diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt Binary files differindex b83a8a3a5d..e0ebf42ea7 100644 --- a/ext/standard/tests/strings/strtoupper1.phpt +++ b/ext/standard/tests/strings/strtoupper1.phpt diff --git a/ext/standard/tests/strings/strtr_error.phpt b/ext/standard/tests/strings/strtr_error.phpt index f34085fb4d..0d4d157776 100644 --- a/ext/standard/tests/strings/strtr_error.phpt +++ b/ext/standard/tests/strings/strtr_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strtr() function : error conditions +Test strtr() function : error conditions --FILE-- <?php /* Prototype : string strtr(string str, string from[, string to]) - * Description: Translates characters in str using given translation tables + * Description: Translates characters in str using given translation tables * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt index bac7903fa0..cb6ad267ad 100644 --- a/ext/standard/tests/strings/strtr_variation5.phpt +++ b/ext/standard/tests/strings/strtr_variation5.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'str' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'str' - * and expected type for 'from' & 'to' arguments +/* Test strtr() function: with unexpected inputs for 'str' + * and expected type for 'from' & 'to' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'str' ***\n"; diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 831d81d3fb..5e06da6178 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'from' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'from' - * and expected type for 'str' & 'to' arguments +/* Test strtr() function: with unexpected inputs for 'from' + * and expected type for 'str' & 'to' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'from' ***\n"; diff --git a/ext/standard/tests/strings/strtr_variation7.phpt b/ext/standard/tests/strings/strtr_variation7.phpt index 5842795273..9f7cb95371 100644 --- a/ext/standard/tests/strings/strtr_variation7.phpt +++ b/ext/standard/tests/strings/strtr_variation7.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'to' argument * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'to' - * and expected types for 'str' & 'from' arguments +/* Test strtr() function: with unexpected inputs for 'to' + * and expected types for 'str' & 'from' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'to' ***\n"; diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt index 646e4b4b22..8d29db1cc3 100644 --- a/ext/standard/tests/strings/strtr_variation8.phpt +++ b/ext/standard/tests/strings/strtr_variation8.phpt @@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'replace_pairs' * Source code: ext/standard/string.c */ -/* Test strtr() function: with unexpected inputs for 'replace_pairs' - * and expected type for 'str' arguments +/* Test strtr() function: with unexpected inputs for 'replace_pairs' + * and expected type for 'str' arguments */ echo "*** Testing strtr() function: with unexpected inputs for 'replace_pairs' ***\n"; diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index 94d1d92331..8140c1cdb1 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strval() function : basic functionality +Test strval() function : basic functionality --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt index 629c003679..94ed70263a 100644 --- a/ext/standard/tests/strings/strval_error.phpt +++ b/ext/standard/tests/strings/strval_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strval() function : usage variations - error conditions +Test strval() function : usage variations - error conditions --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -13,7 +13,7 @@ error_reporting(E_ALL ^ E_NOTICE); class MyClass { - // no toString() method defined + // no toString() method defined } $string = "Hello"; diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index e17d9941d5..2eb665631e 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -3,7 +3,7 @@ Test strval() function : usage variations - Pass different data types as strval --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ @@ -74,7 +74,7 @@ $values = array( /*28*/ new MyClass(), // resource -/*29*/ $file_handle, +/*29*/ $file_handle, // undefined data /*30*/ @$undefined_var, diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index beeb8c9283..947d47f20f 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -3,7 +3,7 @@ Test strval() function : usage variations - Pass all valid char codes --FILE-- <?php /* Prototype : string strval ( mixed $var ) - * Description: Get the string value of a variable. + * Description: Get the string value of a variable. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt Binary files differindex f0fc06424b..0901d2082e 100644 --- a/ext/standard/tests/strings/substr.phpt +++ b/ext/standard/tests/strings/substr.phpt diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index 9ea1d95121..eecc251e6c 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -18,7 +18,7 @@ var_dump(substr_count($str, "t", -20)); /* offset > size of the string */ var_dump(substr_count($str, "t", 25)); -/* Using offset and length to go beyond the size of the string: +/* Using offset and length to go beyond the size of the string: Warning message expected, as length+offset > length of string */ var_dump( substr_count($str, "i", 5, 7) ); diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt index 31fdae3397..ac945349fe 100644 --- a/ext/standard/tests/strings/substr_replace_error.phpt +++ b/ext/standard/tests/strings/substr_replace_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test substr_replace() function : error conditions +Test substr_replace() function : error conditions --FILE-- <?php /* Prototype : mixed substr_replace ( mixed $string , string $replacement , int $start [, int $length ] ) diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt index 87f261ca7b..08f75846a5 100644 --- a/ext/standard/tests/strings/trim_basic.phpt +++ b/ext/standard/tests/strings/trim_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test trim() function : basic functionality +Test trim() function : basic functionality --FILE-- <?php diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt index 51dc848c9d..e34cd144cd 100644 --- a/ext/standard/tests/strings/trim_error.phpt +++ b/ext/standard/tests/strings/trim_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test trim() function : error conditions +Test trim() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt Binary files differindex 572d26ebd1..66da7a90f3 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index b0e3be80a7..e35a2c5cb4 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ucwords() function : basic functionality +Test ucwords() function : basic functionality --FILE-- <?php /* Prototype : string ucwords ( string $str ) @@ -31,7 +31,7 @@ $str_array = array( "testing\fucwords" ); -// loop through the $strings array to test ucwords on each element +// loop through the $strings array to test ucwords on each element $iteration = 1; for($index = 0; $index < count($str_array); $index++) { echo "-- Iteration $iteration --\n"; diff --git a/ext/standard/tests/strings/ucwords_error.phpt b/ext/standard/tests/strings/ucwords_error.phpt index a01c688c4a..7ada10c629 100644 --- a/ext/standard/tests/strings/ucwords_error.phpt +++ b/ext/standard/tests/strings/ucwords_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ucwords() function : error conditions +Test ucwords() function : error conditions --FILE-- <?php /* Prototype : string ucwords ( string $str ) diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt index c0107e1300..1604402353 100644 --- a/ext/standard/tests/strings/ucwords_variation1.phpt +++ b/ext/standard/tests/strings/ucwords_variation1.phpt @@ -8,7 +8,7 @@ Test ucwords() function : usage variations - unexpected input values */ /* - * Test ucwords() by passing different values including scalar and non scalar values + * Test ucwords() by passing different values including scalar and non scalar values */ echo "*** Testing ucwords() : usage variations ***\n"; @@ -36,7 +36,7 @@ $values = array ( 12345, -2345, - // hex values + // hex values 0x10, 0X20, 0xAA, @@ -77,7 +77,7 @@ $values = array ( NULL, null, - // hex in string + // hex in string "0x123", '0x123', "0xFF12", diff --git a/ext/standard/tests/strings/unpack_error.phpt b/ext/standard/tests/strings/unpack_error.phpt index 484366293b..f04e493772 100644 --- a/ext/standard/tests/strings/unpack_error.phpt +++ b/ext/standard/tests/strings/unpack_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test unpack() function : error conditions +Test unpack() function : error conditions --FILE-- <?php diff --git a/ext/standard/tests/strings/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt index 201459edab..49e9c19562 100644 --- a/ext/standard/tests/strings/utf8_decode_error.phpt +++ b/ext/standard/tests/strings/utf8_decode_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test utf8_decode() function : error conditions +Test utf8_decode() function : error conditions --FILE-- <?php /* Prototype : proto string utf8_decode(string data) - * Description: Converts a UTF-8 encoded string to ISO-8859-1 + * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt index 5b03723be0..63ccf7d7d1 100644 --- a/ext/standard/tests/strings/utf8_decode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt @@ -3,7 +3,7 @@ Test utf8_decode() function : usage variations - different types for data --FILE-- <?php /* Prototype : proto string utf8_decode(string data) - * Description: Converts a UTF-8 encoded string to ISO-8859-1 + * Description: Converts a UTF-8 encoded string to ISO-8859-1 * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt index 1aabeedd81..e247c38fbb 100644 --- a/ext/standard/tests/strings/utf8_encode_error.phpt +++ b/ext/standard/tests/strings/utf8_encode_error.phpt @@ -3,7 +3,7 @@ Test utf8_encode() function : error conditions --FILE-- <?php /* Prototype : proto string utf8_encode(string data) - * Description: Encodes an ISO-8859-1 string to UTF-8 + * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt index 80edc9ac68..a06b8d869e 100644 --- a/ext/standard/tests/strings/utf8_encode_variation1.phpt +++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt @@ -3,7 +3,7 @@ Test utf8_encode() function : usage variations - <type here specifics of this v --FILE-- <?php /* Prototype : proto string utf8_encode(string data) - * Description: Encodes an ISO-8859-1 string to UTF-8 + * Description: Encodes an ISO-8859-1 string to UTF-8 * Source code: ext/standard/string.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 37d91a7b60..2843e33af5 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : basic functionality +Test vfprintf() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt index 520c8eac3b..c3c869bb4d 100644 --- a/ext/standard/tests/strings/vfprintf_error1.phpt +++ b/ext/standard/tests/strings/vfprintf_error1.phpt @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt index 746652fc5f..1eb89694ec 100644 --- a/ext/standard/tests/strings/vfprintf_error2.phpt +++ b/ext/standard/tests/strings/vfprintf_error2.phpt @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index 5afbdf706f..dbc0d08897 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 8975d01a0f..589d82c3d6 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 184aa0e3f4..6358bccd1c 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test vfprintf() function : variation functionality +Test vfprintf() function : variation functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --INI-- @@ -7,7 +7,7 @@ precision=14 --FILE-- <?php /* Prototype : int vfprintf(resource stream, string format, array args) - * Description: Output a formatted string into a stream + * Description: Output a formatted string into a stream * Source code: ext/standard/formatted_print.c * Alias to functions: */ diff --git a/ext/standard/tests/strings/vfprintf_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt Binary files differindex bb00e70389..fac24dc7a9 100644 --- a/ext/standard/tests/strings/vfprintf_variation10.phpt +++ b/ext/standard/tests/strings/vfprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt index 0afe7c8ac2..bcb60e0ad0 100644 --- a/ext/standard/tests/strings/vfprintf_variation12.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt index fe786d3f49..ffd232355c 100644 --- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,7 +64,7 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ @@ -86,7 +86,7 @@ print_r(file_get_contents($data_file)); echo "\n"; unlink($data_file); - + ?> ===DONE=== --EXPECT-- diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt index 03253b1917..300cd6b666 100644 --- a/ext/standard/tests/strings/vfprintf_variation14.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt index fb34befd3c..9916967b3f 100644 --- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,7 +64,7 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); /* creating dumping file */ diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt index fa81daee71..254bd8c2c1 100644 --- a/ext/standard/tests/strings/vfprintf_variation16.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt index 15b55a97dc..0819cc0e5f 100644 --- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt index df43b2eeed..3d0d810442 100644 --- a/ext/standard/tests/strings/vfprintf_variation18.phpt +++ b/ext/standard/tests/strings/vfprintf_variation18.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - scientific formats with non-scient echo "*** Testing vfprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt index 76ba79fca2..55bfd465bb 100644 --- a/ext/standard/tests/strings/vfprintf_variation4.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index cbc74bfc69..1bf0861c0f 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt index 465c21980b..9194d84866 100644 --- a/ext/standard/tests/strings/vfprintf_variation6.phpt +++ b/ext/standard/tests/strings/vfprintf_variation6.phpt @@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - float formats with non-float value echo "*** Testing vfprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index 084947de45..036c52b04a 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vfprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %Ls %4s %-4s %10.4s %-10.4s %04s %04.4s diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 120e947259..677840a584 100644 --- a/ext/standard/tests/strings/vfprintf_variation9.phpt +++ b/ext/standard/tests/strings/vfprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index f694155b8f..e550ea1c8d 100644 --- a/ext/standard/tests/strings/vprintf_basic1.phpt +++ b/ext/standard/tests/strings/vprintf_basic1.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : int vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic2.phpt b/ext/standard/tests/strings/vprintf_basic2.phpt index cdf6c2d83f..854d6eaeee 100644 --- a/ext/standard/tests/strings/vprintf_basic2.phpt +++ b/ext/standard/tests/strings/vprintf_basic2.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic3.phpt b/ext/standard/tests/strings/vprintf_basic3.phpt index 966ea56f71..616399eed7 100644 --- a/ext/standard/tests/strings/vprintf_basic3.phpt +++ b/ext/standard/tests/strings/vprintf_basic3.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic4.phpt b/ext/standard/tests/strings/vprintf_basic4.phpt index 89494e1217..d8cfa80452 100644 --- a/ext/standard/tests/strings/vprintf_basic4.phpt +++ b/ext/standard/tests/strings/vprintf_basic4.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic5.phpt b/ext/standard/tests/strings/vprintf_basic5.phpt index e999417bf8..67922eaa5e 100644 --- a/ext/standard/tests/strings/vprintf_basic5.phpt +++ b/ext/standard/tests/strings/vprintf_basic5.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic6.phpt b/ext/standard/tests/strings/vprintf_basic6.phpt index 7f1bbd1dde..9ddead58c4 100644 --- a/ext/standard/tests/strings/vprintf_basic6.phpt +++ b/ext/standard/tests/strings/vprintf_basic6.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt index 64047882ec..6fa89a1ea2 100644 --- a/ext/standard/tests/strings/vprintf_basic8.phpt +++ b/ext/standard/tests/strings/vprintf_basic8.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic9.phpt b/ext/standard/tests/strings/vprintf_basic9.phpt index 4aa12a080f..8521d82ec4 100644 --- a/ext/standard/tests/strings/vprintf_basic9.phpt +++ b/ext/standard/tests/strings/vprintf_basic9.phpt @@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_error.phpt b/ext/standard/tests/strings/vprintf_error.phpt index 0bd1e248ef..cf25257fc5 100644 --- a/ext/standard/tests/strings/vprintf_error.phpt +++ b/ext/standard/tests/strings/vprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test vprintf() function : error conditions +Test vprintf() function : error conditions --FILE-- <?php /* Prototype : int vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index d6bedcf1aa..5cf50105ab 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for the format ar --FILE-- <?php /* Prototype : string vprintf(string $format, array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt Binary files differindex d63738e723..747b8c40c5 100644 --- a/ext/standard/tests/strings/vprintf_variation10.phpt +++ b/ext/standard/tests/strings/vprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index d058e91687..99f5c80386 100644 --- a/ext/standard/tests/strings/vprintf_variation11.phpt +++ b/ext/standard/tests/strings/vprintf_variation11.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt index 76819386fd..22e1d83840 100644 --- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation12.phpt b/ext/standard/tests/strings/vprintf_variation12.phpt index 13b43624a1..b29af411c5 100644 --- a/ext/standard/tests/strings/vprintf_variation12.phpt +++ b/ext/standard/tests/strings/vprintf_variation12.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 0101f49e50..27b420a7b0 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vprintf_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt index 480faa12c9..6f9ab49b98 100644 --- a/ext/standard/tests/strings/vprintf_variation13.phpt +++ b/ext/standard/tests/strings/vprintf_variation13.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt index 1fca830023..af5a76eded 100644 --- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation14.phpt b/ext/standard/tests/strings/vprintf_variation14.phpt index a8ee21f4f8..2e7b14db0d 100644 --- a/ext/standard/tests/strings/vprintf_variation14.phpt +++ b/ext/standard/tests/strings/vprintf_variation14.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x diff --git a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt index c3308be017..74b57f4ae8 100644 --- a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt index 32618c00e1..d27bb6270a 100644 --- a/ext/standard/tests/strings/vprintf_variation15.phpt +++ b/ext/standard/tests/strings/vprintf_variation15.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 07dc6909bf..6e27b55dd3 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt index 8c4fe3b260..78e03644cc 100644 --- a/ext/standard/tests/strings/vprintf_variation16.phpt +++ b/ext/standard/tests/strings/vprintf_variation16.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt index 7b72080e0a..5189d58abc 100644 --- a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vprintf_variation17.phpt b/ext/standard/tests/strings/vprintf_variation17.phpt index 657225af9e..e86f80551c 100644 --- a/ext/standard/tests/strings/vprintf_variation17.phpt +++ b/ext/standard/tests/strings/vprintf_variation17.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation18.phpt b/ext/standard/tests/strings/vprintf_variation18.phpt index 961287f2a3..91f5d13694 100644 --- a/ext/standard/tests/strings/vprintf_variation18.phpt +++ b/ext/standard/tests/strings/vprintf_variation18.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti echo "*** Testing vprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e diff --git a/ext/standard/tests/strings/vprintf_variation19.phpt b/ext/standard/tests/strings/vprintf_variation19.phpt index 8b826d8e94..6ceda77022 100644 --- a/ext/standard/tests/strings/vprintf_variation19.phpt +++ b/ext/standard/tests/strings/vprintf_variation19.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt index ae9552021e..9d059569f2 100644 --- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string $format , array $args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt index 97ddc67cb7..69e17d21a7 100644 --- a/ext/standard/tests/strings/vprintf_variation2.phpt +++ b/ext/standard/tests/strings/vprintf_variation2.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for args argument --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt index 8ec00844eb..6967679715 100644 --- a/ext/standard/tests/strings/vprintf_variation3.phpt +++ b/ext/standard/tests/strings/vprintf_variation3.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt index d9566e2bf6..aab27337d9 100644 --- a/ext/standard/tests/strings/vprintf_variation4.phpt +++ b/ext/standard/tests/strings/vprintf_variation4.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt index 27ab3f7ed1..76c079d69a 100644 --- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt index 654f989267..dde6170e9f 100644 --- a/ext/standard/tests/strings/vprintf_variation5.phpt +++ b/ext/standard/tests/strings/vprintf_variation5.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_variation6.phpt b/ext/standard/tests/strings/vprintf_variation6.phpt index 4614b9d1e1..0283bc4541 100644 --- a/ext/standard/tests/strings/vprintf_variation6.phpt +++ b/ext/standard/tests/strings/vprintf_variation6.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with non-float values --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Output a formatted string + * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vprintf() function : usage variations - float formats with non-float values echo "*** Testing vprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f diff --git a/ext/standard/tests/strings/vprintf_variation7.phpt b/ext/standard/tests/strings/vprintf_variation7.phpt Binary files differindex ef2bfecdfb..d7c81fca14 100644 --- a/ext/standard/tests/strings/vprintf_variation7.phpt +++ b/ext/standard/tests/strings/vprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index bd472aca7d..f635b1d4c0 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -3,7 +3,7 @@ Test vprintf() function : usage variations - string formats with non-string valu --FILE-- <?php /* Prototype : string vprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %Ls %4s %-4s %10.4s %-10.4s %04s %04.4s diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 14609374a8..128af1a692 100644 --- a/ext/standard/tests/strings/vprintf_variation9.phpt +++ b/ext/standard/tests/strings/vprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt index 960fcadc3a..611e4b8fbd 100644 --- a/ext/standard/tests/strings/vsprintf_basic1.phpt +++ b/ext/standard/tests/strings/vsprintf_basic1.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - string format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic2.phpt b/ext/standard/tests/strings/vsprintf_basic2.phpt index bd1c3dd519..1afaeb9615 100644 --- a/ext/standard/tests/strings/vsprintf_basic2.phpt +++ b/ext/standard/tests/strings/vsprintf_basic2.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - integer format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic3.phpt b/ext/standard/tests/strings/vsprintf_basic3.phpt index fd0289ede8..44da08c536 100644 --- a/ext/standard/tests/strings/vsprintf_basic3.phpt +++ b/ext/standard/tests/strings/vsprintf_basic3.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - float format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic4.phpt b/ext/standard/tests/strings/vsprintf_basic4.phpt index 15f4a1a680..569ba93987 100644 --- a/ext/standard/tests/strings/vsprintf_basic4.phpt +++ b/ext/standard/tests/strings/vsprintf_basic4.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - bool format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic5.phpt b/ext/standard/tests/strings/vsprintf_basic5.phpt index 3cb5ab15a1..78abb4523d 100644 --- a/ext/standard/tests/strings/vsprintf_basic5.phpt +++ b/ext/standard/tests/strings/vsprintf_basic5.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - char format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic6.phpt b/ext/standard/tests/strings/vsprintf_basic6.phpt index 74dec1ce74..fe8e31d168 100644 --- a/ext/standard/tests/strings/vsprintf_basic6.phpt +++ b/ext/standard/tests/strings/vsprintf_basic6.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - exponential format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt index 3cc02c2e62..e7728af3ca 100644 --- a/ext/standard/tests/strings/vsprintf_basic8.phpt +++ b/ext/standard/tests/strings/vsprintf_basic8.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - octal format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_basic9.phpt b/ext/standard/tests/strings/vsprintf_basic9.phpt index 571d9ac2de..6dc5a4f4b7 100644 --- a/ext/standard/tests/strings/vsprintf_basic9.phpt +++ b/ext/standard/tests/strings/vsprintf_basic9.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - hexadecimal format --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_error.phpt b/ext/standard/tests/strings/vsprintf_error.phpt index 774779f2e5..2876eb1334 100644 --- a/ext/standard/tests/strings/vsprintf_error.phpt +++ b/ext/standard/tests/strings/vsprintf_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test vsprintf() function : error conditions +Test vsprintf() function : error conditions --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 7e810d344d..15c749d3f8 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for the format a --FILE-- <?php /* Prototype : string vsprintf(string $format, array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 9678398058..d81d6c6a87 100644 --- a/ext/standard/tests/strings/vsprintf_variation10.phpt +++ b/ext/standard/tests/strings/vsprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 5845c8b0ca..286c3d0b01 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index 879c05b98b..50e3e86ab7 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt index ae625bd895..e7fbbd0376 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o diff --git a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt index 17698497e2..b843bfaa89 100644 --- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : octal formats and non-octal values ***\n"; // defining array of octal formats -$formats = +$formats = '%o %+o %-o %lo %Lo %4o %-4o %10.4o %-10.4o %.4o @@ -64,9 +64,9 @@ $args_array = array( true, false, TRUE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); - + // looping to test vsprintf() with different octal formats from the above $format array // and with non-octal values from the above $args_array array $counter = 1; diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index e6509d08b0..6cb751f2a0 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index 0ec7a2ad77..fe43c7faec 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt index 37898cfff9..c8994739b6 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x diff --git a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt index 5f31e385ec..5e1eca1055 100644 --- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n"; // defining array of different hexa formats -$formats = +$formats = '%x %+x %-x %lx %Lx %4x %-4x %10.4x %-10.4x %.4x @@ -64,12 +64,12 @@ $args_array = array( true, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), - + ); // looping to test vsprintf() with different hexa formats from the above $format array // and with non-hexa values from the above $args_array array - + $counter = 1; foreach($args_array as $args) { echo "\n-- Iteration $counter --\n"; diff --git a/ext/standard/tests/strings/vsprintf_variation15.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt index ee5b620491..62688be727 100644 --- a/ext/standard/tests/strings/vsprintf_variation15.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index 82660ea419..d4efd44fbd 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index e0933a3aa3..7e86f2890e 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt index 542202d95f..00fdfdbf68 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n"; // defining array of unsigned formats -$formats = +$formats = '%u %+u %-u %lu %Lu %4u %-4u %10.4u %-10.4u %.4u diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt index 5346bd4a06..17790432aa 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt index d2232d8fdc..0d6c17a561 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient echo "*** Testing vsprintf() : scientific formats and non-scientific values ***\n"; // defining array of non-scientific formats -$formats = +$formats = '%e %+e %-e %le %Le %4e %-4e %10.4e %-10.4e %04e %04.4e diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt index de56405eed..e2b3fe0778 100644 --- a/ext/standard/tests/strings/vsprintf_variation19.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt index 9385a6e67f..5cef628edb 100644 --- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string $format , array $args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt index acf4bea9e3..9061c092fe 100644 --- a/ext/standard/tests/strings/vsprintf_variation2.phpt +++ b/ext/standard/tests/strings/vsprintf_variation2.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for args argumen --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index 195e4f1d60..86924cd438 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - int formats with int values --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index 9291b04f37..8fe8aba5cd 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); echo "*** Testing vsprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt index 4698a1dbc4..aa18d6647c 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); echo "*** Testing vsprintf() : int formats and non-integer values ***\n"; // defining array of int formats -$formats = +$formats = '%d %+d %-d %ld %Ld %4d %-4d %10.4d %-10.4d %.4d %04.4d diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index 0be56f1f96..723cd2236c 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with float values --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt index b10e3b11ba..0f167fe8d1 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with non-float value --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - float formats with non-float value echo "*** Testing vsprintf() : float formats and non-float values ***\n"; // defining array of float formats -$formats = +$formats = '%f %+f %-f %lf %Lf %4f %-4f %10.4f %-10.4f %04f %04.4f diff --git a/ext/standard/tests/strings/vsprintf_variation7.phpt b/ext/standard/tests/strings/vsprintf_variation7.phpt Binary files differindex 0085138b78..8f5b8862c2 100644 --- a/ext/standard/tests/strings/vsprintf_variation7.phpt +++ b/ext/standard/tests/strings/vsprintf_variation7.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 0b6e3800bd..109d8b626e 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - string formats with non-string val --FILE-- <?php /* Prototype : string vsprintf(string format, array args) - * Description: Return a formatted string + * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE); echo "*** Testing vsprintf() : string formats and non-string values ***\n"; // defining array of string formats -$formats = +$formats = '%s %+s %-s %ls %4s %-4s %10.4s %-10.4s %04s %04.4s diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex dcc1102ea0..f1ed093218 100644 --- a/ext/standard/tests/strings/vsprintf_variation9.phpt +++ b/ext/standard/tests/strings/vsprintf_variation9.phpt diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt index 1760a9cc77..37f15a3db2 100644 --- a/ext/standard/tests/strings/wordwrap_basic.phpt +++ b/ext/standard/tests/strings/wordwrap_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test wordwrap() function : basic functionality +Test wordwrap() function : basic functionality --FILE-- <?php /* Prototype : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] ) diff --git a/ext/standard/tests/strings/wordwrap_error.phpt b/ext/standard/tests/strings/wordwrap_error.phpt index 98f199abc6..41c5cbdb69 100644 --- a/ext/standard/tests/strings/wordwrap_error.phpt +++ b/ext/standard/tests/strings/wordwrap_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test wordwrap() function : error conditions +Test wordwrap() function : error conditions --FILE-- <?php /* Prototype : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] ) @@ -32,7 +32,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "-- width = 0 & cut = true --\n"; -// width as zero and cut as true +// width as zero and cut as true $width = 0; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); @@ -44,7 +44,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "-- width = -10 & cut = true --\n"; -// width as -ne and cut as true +// width as -ne and cut as true $width = -10; $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt index 28fc128bb7..59462448c8 100644 --- a/ext/standard/tests/strings/wordwrap_variation1.phpt +++ b/ext/standard/tests/strings/wordwrap_variation1.phpt @@ -97,7 +97,7 @@ for($index = 0; $index < count($values); $index ++) { $counter ++; } -// close the resource +// close the resource fclose($fp); echo "Done\n"; diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt index 61d2bbfc8b..4756e98674 100644 --- a/ext/standard/tests/strings/wordwrap_variation2.phpt +++ b/ext/standard/tests/strings/wordwrap_variation2.phpt @@ -8,7 +8,7 @@ Test wordwrap() function : usage variations - unexpected values for width argum */ /* - * test wordwrap by passing different values for width argument + * test wordwrap by passing different values for width argument */ echo "*** Testing wordwrap() : usage variations ***\n"; // initialize all required variables @@ -16,7 +16,7 @@ $str = 'testing wordwrap function'; $break = '<br />\n'; $cut = true; -// resource var +// resource var $fp = fopen(__FILE__, "r"); // get an unset variable @@ -53,7 +53,7 @@ $values = array ( // objects new stdclass(), - // Null value + // Null value NULL, null, @@ -83,7 +83,7 @@ for($index = 0; $index < count($values); $index ++) { var_dump( wordwrap($str, $width) ); var_dump( wordwrap($str, $width, $break) ); - // cut as false + // cut as false $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt index ddf04c77c9..5774ce3752 100644 --- a/ext/standard/tests/strings/wordwrap_variation3.phpt +++ b/ext/standard/tests/strings/wordwrap_variation3.phpt @@ -8,7 +8,7 @@ Test wordwrap() function : usage variations - unexptected values for break argu */ /* - * test wordwrap by passing different values for break argument + * test wordwrap by passing different values for break argument */ echo "*** Testing wordwrap() : usage variations ***\n"; // initialize all required variables @@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) { $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); - // $cut as true + // $cut as true $cut = true; var_dump( wordwrap($str, $width, $break, $cut) ); diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index d8456cd3de..e9384fd9b9 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strptime() function : basic functionality +Test strptime() function : basic functionality --SKIPIF-- <?php if (!function_exists('strptime')) { diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt index 655204de62..a84216f4ff 100644 --- a/ext/standard/tests/time/strptime_error.phpt +++ b/ext/standard/tests/time/strptime_error.phpt @@ -14,7 +14,7 @@ if (!function_exists('strptime')) { * Alias to functions: */ -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); echo "*** Testing strptime() : error conditions ***\n"; diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt index 75609a70e8..6a772d588c 100644 --- a/ext/standard/tests/time/strptime_parts.phpt +++ b/ext/standard/tests/time/strptime_parts.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strptime() function : basic functionality +Test strptime() function : basic functionality --SKIPIF-- <?php if (!function_exists('strptime')) { diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index 452b79cf3e..7edbf7fc0d 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -3,7 +3,7 @@ Test base64_decode() function : basic functionality - ensure all base64 alphabet --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index 05ff5606f9..63f14cac0e 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -3,7 +3,7 @@ Test base64_decode() function : basic functionality - strict vs non-strict with --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_decode_error_001.phpt b/ext/standard/tests/url/base64_decode_error_001.phpt index d36482eacd..8da0a3ae2f 100644 --- a/ext/standard/tests/url/base64_decode_error_001.phpt +++ b/ext/standard/tests/url/base64_decode_error_001.phpt @@ -3,7 +3,7 @@ Test base64_decode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_decode_variation_001.phpt b/ext/standard/tests/url/base64_decode_variation_001.phpt index 605267e143..7c11ad2c33 100644 --- a/ext/standard/tests/url/base64_decode_variation_001.phpt +++ b/ext/standard/tests/url/base64_decode_variation_001.phpt @@ -3,7 +3,7 @@ Test base64_decode() function : usage variations - unexpected types for arg 1 --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index 810becfd24..f527c2ef19 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -3,7 +3,7 @@ Test base64_decode() function : usage variations - unexpected types for arg 2 --FILE-- <?php /* Prototype : proto string base64_decode(string str[, bool strict]) - * Description: Decodes string using MIME base64 algorithm + * Description: Decodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index 825fabe8c5..764e15f377 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test base64_encode() function : basic functionality +Test base64_encode() function : basic functionality --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index cd066f9193..2bcb7519ab 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -1,9 +1,9 @@ --TEST-- -Test base64_encode() function : basic functionality - check algorithm round trips +Test base64_encode() function : basic functionality - check algorithm round trips --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_encode_error_001.phpt b/ext/standard/tests/url/base64_encode_error_001.phpt index fbf595fcef..d87e148302 100644 --- a/ext/standard/tests/url/base64_encode_error_001.phpt +++ b/ext/standard/tests/url/base64_encode_error_001.phpt @@ -3,7 +3,7 @@ Test base64_encode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/base64_encode_variation_001.phpt b/ext/standard/tests/url/base64_encode_variation_001.phpt index d28eb13471..bdf2bc0dd4 100644 --- a/ext/standard/tests/url/base64_encode_variation_001.phpt +++ b/ext/standard/tests/url/base64_encode_variation_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test base64_encode() function : usage variations - unexpected types for argument 1 +Test base64_encode() function : usage variations - unexpected types for argument 1 --FILE-- <?php /* Prototype : proto string base64_encode(string str) - * Description: Encodes string using MIME base64 algorithm + * Description: Encodes string using MIME base64 algorithm * Source code: ext/standard/base64.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index 9d426f969f..0adbb06e52 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying the component +Test parse_url() function: Parse a load of URLs without specifying the component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a and return its components + * Description: Parse a and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index c6027bd026..5f8b6bf145 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index e2c5c3767d..bced2757de 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index 29049aa88d..f705d408d3 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index fabee8cff3..dafb784860 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index 5e91367ef3..d881c9527e 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index ccf48970b9..fc5593ea3b 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index bc54c0bab1..753432107b 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index e031d500bd..b5d32b2053 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component +Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index 9bab058816..065e0c79ba 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -1,9 +1,9 @@ --TEST-- -Test parse_url() function : check values of URL related constants +Test parse_url() function : check values of URL related constants --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_error_001.phpt b/ext/standard/tests/url/parse_url_error_001.phpt index 32770b9a4f..c2740dedd9 100644 --- a/ext/standard/tests/url/parse_url_error_001.phpt +++ b/ext/standard/tests/url/parse_url_error_001.phpt @@ -3,7 +3,7 @@ Test parse_url() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt index b08c900d9f..6131f1a457 100644 --- a/ext/standard/tests/url/parse_url_error_002.phpt +++ b/ext/standard/tests/url/parse_url_error_002.phpt @@ -3,7 +3,7 @@ Test parse_url() function: url component specifier out of range --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_variation_001.phpt b/ext/standard/tests/url/parse_url_variation_001.phpt index 4378e71354..fe04ad4a09 100644 --- a/ext/standard/tests/url/parse_url_variation_001.phpt +++ b/ext/standard/tests/url/parse_url_variation_001.phpt @@ -3,7 +3,7 @@ Test parse_url() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt index 9dfe00ceb4..85fae69840 100644 --- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -5,7 +5,7 @@ Test parse_url() function : usage variations - unexpected type for arg 2. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt index 8bd4e8884f..3d88dfc25c 100644 --- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -5,7 +5,7 @@ Test parse_url() function : usage variations - unexpected type for arg 2. --FILE-- <?php /* Prototype : proto mixed parse_url(string url, [int url_component]) - * Description: Parse a URL and return its components + * Description: Parse a URL and return its components * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/rawurldecode_error_001.phpt b/ext/standard/tests/url/rawurldecode_error_001.phpt index 46343ec4f5..0fe038caef 100644 --- a/ext/standard/tests/url/rawurldecode_error_001.phpt +++ b/ext/standard/tests/url/rawurldecode_error_001.phpt @@ -3,7 +3,7 @@ Test rawurldecode() function : error conditions - wrong number of args --FILE-- <?php /* Prototype : proto string rawurldecode(string str) - * Description: Decodes URL-encodes string + * Description: Decodes URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/rawurldecode_variation_001.phpt b/ext/standard/tests/url/rawurldecode_variation_001.phpt index 1d484b2cc7..6428b96fcf 100644 --- a/ext/standard/tests/url/rawurldecode_variation_001.phpt +++ b/ext/standard/tests/url/rawurldecode_variation_001.phpt @@ -3,7 +3,7 @@ Test rawurldecode() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto string rawurldecode(string str) - * Description: Decodes URL-encodes string + * Description: Decodes URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/rawurlencode_error_001.phpt b/ext/standard/tests/url/rawurlencode_error_001.phpt index aaeada6f4b..f8b3e61c37 100644 --- a/ext/standard/tests/url/rawurlencode_error_001.phpt +++ b/ext/standard/tests/url/rawurlencode_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test rawurlencode() function : error conditions +Test rawurlencode() function : error conditions --FILE-- <?php /* Prototype : proto string rawurlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/rawurlencode_variation_001.phpt b/ext/standard/tests/url/rawurlencode_variation_001.phpt index b0d9180fe9..1dabc4bde9 100644 --- a/ext/standard/tests/url/rawurlencode_variation_001.phpt +++ b/ext/standard/tests/url/rawurlencode_variation_001.phpt @@ -3,7 +3,7 @@ Test rawurlencode() function : usage variations - unexpected type for arg 1. --FILE-- <?php /* Prototype : proto string rawurlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/urldecode_error_001.phpt b/ext/standard/tests/url/urldecode_error_001.phpt index 976da0b1b5..b009d7d53e 100644 --- a/ext/standard/tests/url/urldecode_error_001.phpt +++ b/ext/standard/tests/url/urldecode_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test urldecode() function : error conditions +Test urldecode() function : error conditions --FILE-- <?php /* Prototype : proto string urldecode(string str) - * Description: Decodes URL-encoded string + * Description: Decodes URL-encoded string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/urldecode_variation_001.phpt b/ext/standard/tests/url/urldecode_variation_001.phpt index a9171473cc..fe538b7072 100644 --- a/ext/standard/tests/url/urldecode_variation_001.phpt +++ b/ext/standard/tests/url/urldecode_variation_001.phpt @@ -3,7 +3,7 @@ Test urldecode() function : usage variations - <type here specifics of this var --FILE-- <?php /* Prototype : proto string urldecode(string str) - * Description: Decodes URL-encoded string + * Description: Decodes URL-encoded string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/urlencode_error_001.phpt b/ext/standard/tests/url/urlencode_error_001.phpt index 430c08a1ed..7e43ef73bf 100644 --- a/ext/standard/tests/url/urlencode_error_001.phpt +++ b/ext/standard/tests/url/urlencode_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test urlencode() function : error conditions +Test urlencode() function : error conditions --FILE-- <?php /* Prototype : proto string urlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/url/urlencode_variation_001.phpt b/ext/standard/tests/url/urlencode_variation_001.phpt index 5c0cda66aa..d74209d137 100644 --- a/ext/standard/tests/url/urlencode_variation_001.phpt +++ b/ext/standard/tests/url/urlencode_variation_001.phpt @@ -3,7 +3,7 @@ Test urlencode() function : usage variations - <type here specifics of this var --FILE-- <?php /* Prototype : proto string urlencode(string str) - * Description: URL-encodes string + * Description: URL-encodes string * Source code: ext/standard/url.c * Alias to functions: */ diff --git a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt index 4e45870dfc..01f23e7601 100644 --- a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt @@ -1,5 +1,5 @@ --TEST-- -php_sapi_name() function when switching to webserver by using post +php_sapi_name() function when switching to webserver by using post --POST-- foo=BAR --CREDITS-- |