diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 7323f5de2f1..2b1c17bd1e4 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -60,7 +60,7 @@ foreach ($scalar_variables as $scalar_var) { // destroy the variable using unset unset( $scalar_var ); - // dump and see if its destroyed, expcted: NULL + // dump and see if its destroyed, expcted: NULL var_dump( $scalar_var ); // check using isset to see if unset, expected: bool(false) @@ -106,11 +106,11 @@ foreach ($array_variables as $array_var) { var_dump( isset($array_var['non_existent'], $array_var['none']) ); var_dump( empty($array_var['non_existent']) ); - // testing empty and isset on arrays + // testing empty and isset on arrays var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set - // get the keys of the $array_var + // get the keys of the $array_var $keys = array_keys($array_var); // unset each element in the array and see the working of unset, isset & empty $inner_loop_counter = 1; @@ -130,7 +130,7 @@ foreach ($array_variables as $array_var) { // calling empty, expected bool(true) var_dump( empty($array_var[$key_val]) ); - // dump the array to see that that array did not get modified + // dump the array to see that that array did not get modified // because of using isset, empty and unset on its element var_dump($array_var); } @@ -184,11 +184,11 @@ foreach ($resources as $resource) { // now the isset() with both the args as unset var_dump( isset($resource, $temp_var) ); // expected: bool(false); - // dump the resource to see if there any effect on it + // dump the resource to see if there any effect on it var_dump($resource); } // unset and dump the array containing all the resources to see that -// unset works correctly +// unset works correctly unset($resources); var_dump($resources); var_dump( isset($resources) ); //expected: bool(false) @@ -215,8 +215,8 @@ class Point } $point1 = new Point(30,40); -// use unset/empty/isset to check the object -var_dump($point1); // dump the object +// use unset/empty/isset to check the object +var_dump($point1); // dump the object // check the object and member that is not set var_dump( isset($point1) ); // expected: bool(true) @@ -229,7 +229,7 @@ $point1->setLable("Point1"); var_dump( isset($point1->$lable) ); //expected: bool(true) var_dump( empty($point1->$lable) ); //expected: bool(false) -// dump the object to see that obj was not harmed +// dump the object to see that obj was not harmed // because of the usage of the isset & empty var_dump($point1); @@ -270,11 +270,11 @@ var_dump($point2); /* testing variation in operation for isset(), empty() & unset(). Note: Most of the variation for function unset() is testing by a - set of testcases named "Zend/tests/unset_cv??.phpt", only + set of testcases named "Zend/tests/unset_cv??.phpt", only variation not tested are attempted here */ echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n"; -/* unset() variation1: checking unset on static variable inside a function. +/* unset() variation1: checking unset on static variable inside a function. * unset() destroys the variable only in the context of the rest of a function * Following calls will restore the previous value of a variable. */ @@ -286,14 +286,14 @@ function test_unset1() { $static_var ++; echo "value of static_var before unset: $static_var\n"; - // check using isset and empty + // check using isset and empty var_dump( isset($static_var) ); var_dump( empty($static_var) ); // unset the static var unset($static_var); echo "value of static_var after unset: $static_var\n"; - // check using isset and empty + // check using isset and empty var_dump( isset($static_var) ); var_dump( empty($static_var) ); @@ -308,10 +308,10 @@ test_unset1(); echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n"; -/* unset() variation2: Pass by reference - * If a variable that is PASSED BY REFERENCE is unset() inside of a function, +/* unset() variation2: Pass by reference + * If a variable that is PASSED BY REFERENCE is unset() inside of a function, * only the local variable is destroyed. The variable in the calling environment - * will retain the same value as before unset() was called. + * will retain the same value as before unset() was called. */ function test_unset2( &$ref_val ) { // unset the variable passed @@ -341,14 +341,14 @@ $global_var = 10; function test_unset3() { global $global_var; - // check the $global_var using isset and empty + // check the $global_var using isset and empty var_dump( isset($global_var) ); var_dump( empty($global_var) ); // unset the global var unset($global_var); - // check the $global_var using isset and empty + // check the $global_var using isset and empty var_dump( isset($global_var) ); var_dump( empty($global_var) ); } diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt index d3363f80f42..f0066ee3cd1 100644 --- a/Zend/tests/add_003.phpt +++ b/Zend/tests/add_003.phpt @@ -1,5 +1,5 @@ --TEST-- -adding arrays to objects +adding arrays to objects --FILE-- Comment = $comment; } function __destruct() { - out($this->Comment); // this line doesn't crash PHP + out($this->Comment); // this line doesn't crash PHP out("\n"); // this line } } diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt index 833f81bdb36..0ab4760d488 100644 --- a/Zend/tests/bug26802.phpt +++ b/Zend/tests/bug26802.phpt @@ -21,8 +21,8 @@ class foo } } -/* The following is a BC break with PHP 4 where it would - * call foo::fail. In PHP 5 we first evaluate static class +/* The following is a BC break with PHP 4 where it would + * call foo::fail. In PHP 5 we first evaluate static class * properties and then do the function call. */ $method = 'foo_func'; diff --git a/Zend/tests/bug39438.phpt b/Zend/tests/bug39438.phpt index ef985afd235..d10e6d9ab72 100644 --- a/Zend/tests/bug39438.phpt +++ b/Zend/tests/bug39438.phpt @@ -22,9 +22,9 @@ $test2=array( 'typo3' =>'', 'php' =>'', 'cms' => '' - ), - 'conflicts' => array('' =>'') - ), + ), + 'conflicts' => array('' =>'') + ), 'authorname' => 'Mirko Balluff', 'authoremail' => 'balluff@amt1.de', 'ownerusername' => 'amt1', diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/bug43450.phpt index 549dfc91b9c..05f2f7cbf6d 100644 --- a/Zend/tests/bug43450.phpt +++ b/Zend/tests/bug43450.phpt @@ -5,7 +5,7 @@ opcache.enable_cli=0 --FILE-- publicProperty, - $this->protectedProperty, + $this->publicProperty, + $this->protectedProperty, $this->privateProperty ); } diff --git a/Zend/tests/bug70785.phpt b/Zend/tests/bug70785.phpt index 3c427ba069f..f48bc3cdb99 100644 --- a/Zend/tests/bug70785.phpt +++ b/Zend/tests/bug70785.phpt @@ -8,7 +8,7 @@ set_error_handler(function($no, $msg) { }); try { - if ($a === null) { // ZEND_VM_SMART_BRANCH + if ($a === null) { // ZEND_VM_SMART_BRANCH undefined_function('Null'); } } catch (Exception $e) { diff --git a/Zend/tests/bug70805.phpt b/Zend/tests/bug70805.phpt index ec835bcd1b9..1177233184a 100644 --- a/Zend/tests/bug70805.phpt +++ b/Zend/tests/bug70805.phpt @@ -37,7 +37,7 @@ $t[] = &$t; unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots $e = $a; -unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, +unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, // but C::__destructor which is called in gc_colloct_roots will put $a into buf // which will make $a be putted into gc roots buf twice var_dump(gc_collect_cycles()); diff --git a/Zend/tests/bug70914.phpt b/Zend/tests/bug70914.phpt index e5f5d7460ee..0382076efb3 100644 --- a/Zend/tests/bug70914.phpt +++ b/Zend/tests/bug70914.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #70914 zend_throw_or_error() format string vulnerability +Bug #70914 zend_throw_or_error() format string vulnerability --SKIPIF-- [ 'b' => [], - ], + ], ]; create_references($data); diff --git a/Zend/tests/cast_to_array.phpt b/Zend/tests/cast_to_array.phpt index 5e351052bbb..12261c8e844 100644 Binary files a/Zend/tests/cast_to_array.phpt and b/Zend/tests/cast_to_array.phpt differ diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt index 7776992bc82..d2ee8ca1e93 100644 --- a/Zend/tests/cast_to_double.phpt +++ b/Zend/tests/cast_to_double.phpt @@ -1,5 +1,5 @@ --TEST-- -casting different variables to double +casting different variables to double --INI-- precision=14 --FILE-- diff --git a/Zend/tests/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt index 04d68053e26..b7e5f219f67 100644 Binary files a/Zend/tests/cast_to_object.phpt and b/Zend/tests/cast_to_object.phpt differ diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt index f8b57a22c51..b3d245f1ed9 100644 Binary files a/Zend/tests/cast_to_string.phpt and b/Zend/tests/cast_to_string.phpt differ diff --git a/Zend/tests/class_constants_004.phpt b/Zend/tests/class_constants_004.phpt index 73a42ede7a4..1ca49ebdf00 100644 --- a/Zend/tests/class_constants_004.phpt +++ b/Zend/tests/class_constants_004.phpt @@ -21,9 +21,9 @@ $const = __NAMESPACE__ .'\\foo'; // class $const2 = __NAMESPACE__ .'\\Ifoo'; // interface var_dump( foo, - \foo\foo, - namespace\foo, - \foo\foo::foo, + \foo\foo, + namespace\foo, + \foo\foo::foo, $const::foo, \foo, constant('foo'), diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt index 695c8d21503..7cc868105a2 100644 --- a/Zend/tests/debug_backtrace_with_include_and_this.phpt +++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt @@ -1,5 +1,5 @@ --TEST-- -debug_backtrace segmentation fault with include and error handler +debug_backtrace segmentation fault with include and error handler --FILE-- +?> ===Done=== --EXPECTF-- *** Testing get_defined_functions() : error conditions *** @@ -26,5 +26,4 @@ var_dump( get_defined_functions($extra_arg, $extra_arg2) ); Warning: get_defined_functions() expects at most 1 parameter, 2 given in %s on line %d NULL - ===Done=== diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt index 551ab7f5f52..9a9c5401fe2 100644 --- a/Zend/tests/globals_001.phpt +++ b/Zend/tests/globals_001.phpt @@ -1,5 +1,5 @@ --TEST-- -globals in global scope +globals in global scope --INI-- variables_order="egpcs" --FILE-- diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt index 123fbc80e57..6e21b7fbc03 100644 --- a/Zend/tests/globals_004.phpt +++ b/Zend/tests/globals_004.phpt @@ -1,5 +1,5 @@ --TEST-- -globals in local scope - 3 +globals in local scope - 3 --INI-- variables_order="egpcs" --FILE-- diff --git a/Zend/tests/inter_01.phpt b/Zend/tests/inter_01.phpt index f39d5a41818..71c50c2595e 100644 --- a/Zend/tests/inter_01.phpt +++ b/Zend/tests/inter_01.phpt @@ -1,5 +1,5 @@ --TEST-- -Inherited constant from interface +Inherited constant from interface --FILE-- --FILE-- diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt index bc0c9fed155..1c1707eab2a 100644 --- a/ext/ctype/tests/ctype_cntrl_basic.phpt +++ b/ext/ctype/tests/ctype_cntrl_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ctype_cntrl() function : basic functionality +Test ctype_cntrl() function : basic functionality --SKIPIF-- --FILE-- diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt index 171959d9442..d920728ac10 100644 --- a/ext/ctype/tests/ctype_graph_basic.phpt +++ b/ext/ctype/tests/ctype_graph_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ctype_graph() function : basic functionality +Test ctype_graph() function : basic functionality --SKIPIF-- --FILE-- --FILE-- diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt index 27446b7760d..33a70fe7356 100644 --- a/ext/ctype/tests/ctype_print_basic.phpt +++ b/ext/ctype/tests/ctype_print_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ctype_print() function : basic functionality +Test ctype_print() function : basic functionality --SKIPIF-- --FILE-- diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt index 567d2c8c2db..76a0278c052 100644 --- a/ext/ctype/tests/ctype_punct_basic.phpt +++ b/ext/ctype/tests/ctype_punct_basic.phpt @@ -1,12 +1,12 @@ --TEST-- -Test ctype_punct() function : basic functionality +Test ctype_punct() function : basic functionality --SKIPIF-- --FILE-- --FILE-- diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt index daa68dad6a1..5334b6c63a1 100644 --- a/ext/ctype/tests/ctype_space_variation1.phpt +++ b/ext/ctype/tests/ctype_space_variation1.phpt @@ -62,7 +62,7 @@ $inputs = array( false, TRUE, FALSE, - + // empty data /*16*/ "", '', @@ -72,7 +72,7 @@ $inputs = array( /*19*/ "\n\t\r", ' ', $heredoc, - + // object data /*22*/ new classA(), diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt index ac33a01b412..a528123f94b 100644 --- a/ext/ctype/tests/ctype_upper_basic.phpt +++ b/ext/ctype/tests/ctype_upper_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ctype_upper() function : basic functionality +Test ctype_upper() function : basic functionality --SKIPIF-- --FILE-- diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt index b2d23b0548a..7fa2995b2dd 100644 --- a/ext/ctype/tests/ctype_xdigit_basic.phpt +++ b/ext/ctype/tests/ctype_xdigit_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ctype_xdigit() function : basic functionality +Test ctype_xdigit() function : basic functionality --SKIPIF-- --FILE-- TestFest 2009 - AFUP - Jean-Marc Fontaine @@ -8,7 +8,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine --FILE-- +TestFest 2009 - AFUP - Xavier Gorse --SKIPIF-- --FILE-- diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt index 94afa73e26f..05a4854e3ad 100644 --- a/ext/curl/tests/curl_basic_012.phpt +++ b/ext/curl/tests/curl_basic_012.phpt @@ -1,7 +1,7 @@ --TEST-- -Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0 +Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0 --CREDITS-- -TestFest 2009 - AFUP - Xavier Gorse +TestFest 2009 - AFUP - Xavier Gorse --SKIPIF-- --FILE-- @@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Xavier Gorse curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt index 4e9233c080c..69f0721fdab 100644 --- a/ext/curl/tests/curl_basic_013.phpt +++ b/ext/curl/tests/curl_basic_013.phpt @@ -1,7 +1,7 @@ --TEST-- -Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1 +Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1 --CREDITS-- -TestFest 2009 - AFUP - Xavier Gorse +TestFest 2009 - AFUP - Xavier Gorse --SKIPIF-- --FILE-- @@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Xavier Gorse curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use - + $curl_content = curl_exec($ch); curl_close($ch); diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt index 49ee91ac037..9f1bdaf6362 100644 --- a/ext/curl/tests/curl_basic_017.phpt +++ b/ext/curl/tests/curl_basic_017.phpt @@ -1,5 +1,5 @@ --TEST-- -Test curl_multi_exec() function with basic functionality +Test curl_multi_exec() function with basic functionality --CREDITS-- TestFest 2009 - AFUP - Thomas Rabaix --SKIPIF-- @@ -7,7 +7,7 @@ TestFest 2009 - AFUP - Thomas Rabaix --FILE-- --SKIPIF-- diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt index 2903a751c6c..7801fe56749 100644 --- a/ext/curl/tests/curl_copy_handle_basic.phpt +++ b/ext/curl/tests/curl_copy_handle_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test curl_copy_handle() function with basic functionality +Test curl_copy_handle() function with basic functionality --CREDITS-- Francesco Fullone ff@ideato.it #PHPTestFest Cesena Italia on 2009-06-20 diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt index e759144c8ac..015b010a1ca 100644 Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ diff --git a/ext/curl/tests/curl_multi_getcontent_error1.phpt b/ext/curl/tests/curl_multi_getcontent_error1.phpt index c57957b8355..6e23a2902a4 100644 --- a/ext/curl/tests/curl_multi_getcontent_error1.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Curl_multi_getcontent() error test +Curl_multi_getcontent() error test --CREDITS-- Rein Velt (rein@velt.org) #TestFest Utrecht 20090509 diff --git a/ext/curl/tests/curl_multi_getcontent_error2.phpt b/ext/curl/tests/curl_multi_getcontent_error2.phpt index 4ec6092401c..1c8fa676630 100644 --- a/ext/curl/tests/curl_multi_getcontent_error2.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Curl_multi_getcontent() error test +Curl_multi_getcontent() error test --CREDITS-- Rein Velt (rein@velt.org) #TestFest Utrecht 20090509 diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt index e75959f49b2..0de4d03727f 100644 --- a/ext/curl/tests/curl_multi_getcontent_error3.phpt +++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Curl_multi_getcontent() error test +Curl_multi_getcontent() error test --CREDITS-- Rein Velt (rein@velt.org) #TestFest Utrecht 20090509 diff --git a/ext/curl/tests/curl_multi_select_basic1.phpt b/ext/curl/tests/curl_multi_select_basic1.phpt index 7ae812412ea..03bd9263a2b 100644 --- a/ext/curl/tests/curl_multi_select_basic1.phpt +++ b/ext/curl/tests/curl_multi_select_basic1.phpt @@ -8,7 +8,7 @@ Ivo Jansch --FILE-- Dutch UG, TestFest 2009, Utrecht diff --git a/ext/curl/tests/curl_write_return.phpt b/ext/curl/tests/curl_write_return.phpt index 1ddc5515779..583ec2fcc1e 100644 --- a/ext/curl/tests/curl_write_return.phpt +++ b/ext/curl/tests/curl_write_return.phpt @@ -1,5 +1,5 @@ --TEST-- -Test curl option CURLOPT_RETURNTRANSFER +Test curl option CURLOPT_RETURNTRANSFER --CREDITS-- Mathieu Kooiman Dutch UG, TestFest 2009, Utrecht diff --git a/ext/curl/tests/curl_writeheader_callback.phpt b/ext/curl/tests/curl_writeheader_callback.phpt index 46e0cc18baa..6336e14a6d9 100644 --- a/ext/curl/tests/curl_writeheader_callback.phpt +++ b/ext/curl/tests/curl_writeheader_callback.phpt @@ -1,5 +1,5 @@ --TEST-- -Test curl option CURLOPT_HEADERFUNCTION +Test curl option CURLOPT_HEADERFUNCTION --CREDITS-- Mathieu Kooiman Dutch UG, TestFest 2009, Utrecht diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt index 22aee7d08a6..a40efc7411e 100644 --- a/ext/date/tests/DateTimeZone_clone_basic1.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt @@ -3,7 +3,7 @@ Test clone on DateTimeZone objects --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index 7857e166bc4..3922454865b 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test DateTimeZone class inheritance +Test DateTimeZone class inheritance --FILE-- getTimezone(); @@ -12,11 +12,11 @@ var_dump($serialized); $tz2 = unserialize($serialized); var_dump($tz2); -// Try to use unserialzied object +// Try to use unserialzied object var_dump( $tz2->getName() ); ?> -===DONE=== +===DONE=== --EXPECTF-- object(DateTimeZone)#%d (2) { ["timezone_type"]=> diff --git a/ext/date/tests/DateTimeZone_serialize_type_2.phpt b/ext/date/tests/DateTimeZone_serialize_type_2.phpt index 6d9e3495efd..92f1e70bc4d 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_2.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_2.phpt @@ -2,7 +2,7 @@ Test serialization of DateTimeZone objects --FILE-- getName() ); ?> -===DONE=== +===DONE=== --EXPECTF-- object(DateTimeZone)#%d (2) { ["timezone_type"]=> diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt index 926f7967313..cffef81b6bc 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt @@ -2,7 +2,7 @@ Test serialization of DateTimeZone objects --FILE-- getName() ); ?> -===DONE=== +===DONE=== --EXPECT-- object(DateTimeZone)#1 (2) { ["timezone_type"]=> diff --git a/ext/date/tests/DateTime_add-dates.phpt b/ext/date/tests/DateTime_add-dates.phpt index 48c821ff9d9..46d96540acb 100644 --- a/ext/date/tests/DateTime_add-dates.phpt +++ b/ext/date/tests/DateTime_add-dates.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::add() -- dates +DateTime::add() -- dates --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_add-fall-type3-type3.phpt b/ext/date/tests/DateTime_add-fall-type3-type3.phpt index 24315529a07..acf63502946 100644 --- a/ext/date/tests/DateTime_add-fall-type3-type3.phpt +++ b/ext/date/tests/DateTime_add-fall-type3-type3.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::add() -- fall type3 type3 +DateTime::add() -- fall type3 type3 --CREDITS-- Daniel Convissor --XFAIL-- diff --git a/ext/date/tests/DateTime_add-february.phpt b/ext/date/tests/DateTime_add-february.phpt index 8e47c0eddf0..990e5557b93 100644 --- a/ext/date/tests/DateTime_add-february.phpt +++ b/ext/date/tests/DateTime_add-february.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::add() -- february +DateTime::add() -- february --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_clone_basic1.phpt b/ext/date/tests/DateTime_clone_basic1.phpt index 0ddd74b14e3..318d5c3d7fb 100644 --- a/ext/date/tests/DateTime_clone_basic1.phpt +++ b/ext/date/tests/DateTime_clone_basic1.phpt @@ -3,7 +3,7 @@ Test clone on DateTime objects --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index 12e5c43579f..625b24df2d8 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -10,7 +10,7 @@ Test new DateTime() function : usage variation - Passing unexpected values to se echo "*** Testing new DateTime() : usage variation - unexpected values to second argument \$timezone***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_days-absolute.phpt b/ext/date/tests/DateTime_days-absolute.phpt index 7a150e39a71..71a3f631cb7 100644 --- a/ext/date/tests/DateTime_days-absolute.phpt +++ b/ext/date/tests/DateTime_days-absolute.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() days -- absolute +DateTime::diff() days -- absolute --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_days-dates.phpt b/ext/date/tests/DateTime_days-dates.phpt index 446d56d78d5..574247a0ca6 100644 --- a/ext/date/tests/DateTime_days-dates.phpt +++ b/ext/date/tests/DateTime_days-dates.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() days -- dates +DateTime::diff() days -- dates --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_days-fall-type3-type3.phpt b/ext/date/tests/DateTime_days-fall-type3-type3.phpt index 38e4ef50f58..10579da98b5 100644 --- a/ext/date/tests/DateTime_days-fall-type3-type3.phpt +++ b/ext/date/tests/DateTime_days-fall-type3-type3.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() days -- fall type3 type3 +DateTime::diff() days -- fall type3 type3 --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_days-february.phpt b/ext/date/tests/DateTime_days-february.phpt index b8107d703d2..81032b7876f 100644 --- a/ext/date/tests/DateTime_days-february.phpt +++ b/ext/date/tests/DateTime_days-february.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() days -- february +DateTime::diff() days -- february --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_diff-absolute.phpt b/ext/date/tests/DateTime_diff-absolute.phpt index 5295b3a721d..92b607074d6 100644 --- a/ext/date/tests/DateTime_diff-absolute.phpt +++ b/ext/date/tests/DateTime_diff-absolute.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() -- absolute +DateTime::diff() -- absolute --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_diff-dates.phpt b/ext/date/tests/DateTime_diff-dates.phpt index 71c5e1b6c8c..f71dcbaa563 100644 --- a/ext/date/tests/DateTime_diff-dates.phpt +++ b/ext/date/tests/DateTime_diff-dates.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() -- dates +DateTime::diff() -- dates --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_diff-fall-type3-type3.phpt b/ext/date/tests/DateTime_diff-fall-type3-type3.phpt index bf25fef6207..484dbe2b5f3 100644 --- a/ext/date/tests/DateTime_diff-fall-type3-type3.phpt +++ b/ext/date/tests/DateTime_diff-fall-type3-type3.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() -- fall type3 type3 +DateTime::diff() -- fall type3 type3 --CREDITS-- Daniel Convissor --XFAIL-- diff --git a/ext/date/tests/DateTime_diff-february.phpt b/ext/date/tests/DateTime_diff-february.phpt index 7705b12e327..7f483bd6d38 100644 --- a/ext/date/tests/DateTime_diff-february.phpt +++ b/ext/date/tests/DateTime_diff-february.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::diff() -- february +DateTime::diff() -- february --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt index aadc8967dcf..04f4f76accb 100644 --- a/ext/date/tests/DateTime_extends_basic1.phpt +++ b/ext/date/tests/DateTime_extends_basic1.phpt @@ -1,9 +1,9 @@ --TEST-- -Test DateTime class inheritance +Test DateTime class inheritance --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt index 6ade190f82c..9a2d22f4a13 100644 --- a/ext/date/tests/DateTime_getOffset_basic1.phpt +++ b/ext/date/tests/DateTime_getOffset_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DateTime::getOffset() function : basic functionality +Test DateTime::getOffset() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_serialize.phpt b/ext/date/tests/DateTime_serialize.phpt index 501f826cea3..48b8b01cf96 100644 --- a/ext/date/tests/DateTime_serialize.phpt +++ b/ext/date/tests/DateTime_serialize.phpt @@ -2,7 +2,7 @@ Test serialization of DateTime objects --FILE-- format( "F j, Y, g:i a") ); ?> -===DONE=== +===DONE=== --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index 9bcfde9f386..e74799928cc 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -1,14 +1,14 @@ --TEST-- -Test DateTime::setDate() function : basic functionality +Test DateTime::setDate() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt index f74a99e7e81..01c335991f3 100644 --- a/ext/date/tests/DateTime_setISODate_variation2.phpt +++ b/ext/date/tests/DateTime_setISODate_variation2.phpt @@ -3,14 +3,14 @@ Test DateTime::setISODate() function : usage variation - Passing unexpected valu --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt index 2a7d34fa95b..3f0b43d7ff9 100644 --- a/ext/date/tests/DateTime_setISODate_variation3.phpt +++ b/ext/date/tests/DateTime_setISODate_variation3.phpt @@ -3,14 +3,14 @@ Test DateTime::setISODate() function : usage variation - Passing unexpected valu --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt index 25a2ab095f8..e5505a0501c 100644 --- a/ext/date/tests/DateTime_setTime_basic1.phpt +++ b/ext/date/tests/DateTime_setTime_basic1.phpt @@ -1,14 +1,14 @@ --TEST-- -Test DateTime::setTime() function : basic functionality +Test DateTime::setTime() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt index 0fdbfd34f80..f65966b014c 100644 --- a/ext/date/tests/DateTime_setTime_variation2.phpt +++ b/ext/date/tests/DateTime_setTime_variation2.phpt @@ -3,14 +3,14 @@ Test DateTime::setTime() function : usage variation - Passing unexpected values --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt index d41fe3a99c1..a2cbff9f1bb 100644 --- a/ext/date/tests/DateTime_setTime_variation3.phpt +++ b/ext/date/tests/DateTime_setTime_variation3.phpt @@ -3,14 +3,14 @@ Test DateTime::setTime() function : usage variation - Passing unexpected values --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_setTimezone_basic1.phpt b/ext/date/tests/DateTime_setTimezone_basic1.phpt index 4f3825ac882..90e799e20c1 100644 --- a/ext/date/tests/DateTime_setTimezone_basic1.phpt +++ b/ext/date/tests/DateTime_setTimezone_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DateTime::setTimezone() function : basic functionality +Test DateTime::setTimezone() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/DateTime_sub-dates.phpt b/ext/date/tests/DateTime_sub-dates.phpt index 26f49ba8382..78b621c2bd2 100644 --- a/ext/date/tests/DateTime_sub-dates.phpt +++ b/ext/date/tests/DateTime_sub-dates.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::sub() -- dates +DateTime::sub() -- dates --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/DateTime_sub-fall-type3-type3.phpt b/ext/date/tests/DateTime_sub-fall-type3-type3.phpt index 6448b5d8423..c217611d6f2 100644 --- a/ext/date/tests/DateTime_sub-fall-type3-type3.phpt +++ b/ext/date/tests/DateTime_sub-fall-type3-type3.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::sub() -- fall type3 type3 +DateTime::sub() -- fall type3 type3 --CREDITS-- Daniel Convissor --XFAIL-- diff --git a/ext/date/tests/DateTime_sub-february.phpt b/ext/date/tests/DateTime_sub-february.phpt index 23c8da44791..09dc099c8e4 100644 --- a/ext/date/tests/DateTime_sub-february.phpt +++ b/ext/date/tests/DateTime_sub-february.phpt @@ -1,5 +1,5 @@ --TEST-- -DateTime::sub() -- february +DateTime::sub() -- february --CREDITS-- Daniel Convissor --FILE-- diff --git a/ext/date/tests/checkdate_basic1.phpt b/ext/date/tests/checkdate_basic1.phpt index 2937f29a8ea..9be78eb1712 100644 --- a/ext/date/tests/checkdate_basic1.phpt +++ b/ext/date/tests/checkdate_basic1.phpt @@ -1,14 +1,14 @@ --TEST-- -Test date_create() function : basic functionality +Test date_create() function : basic functionality --FILE-- max year -var_dump( checkdate(7, 2, 0) ); // ===DONE=== diff --git a/ext/date/tests/checkdate_error.phpt b/ext/date/tests/checkdate_error.phpt index 02772b9b5ba..a96aa50f2c4 100644 --- a/ext/date/tests/checkdate_error.phpt +++ b/ext/date/tests/checkdate_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test checkdate() function : error conditions +Test checkdate() function : error conditions --FILE-- -===DONE=== +===DONE=== --EXPECTF-- *** Testing checkdate() : error conditions *** diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt index 166a8a35085..a29212b1ae0 100644 --- a/ext/date/tests/checkdate_variation1.phpt +++ b/ext/date/tests/checkdate_variation1.phpt @@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to first --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt index c9d9782e0f9..2474ca9e535 100644 --- a/ext/date/tests/checkdate_variation2.phpt +++ b/ext/date/tests/checkdate_variation2.phpt @@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to secon --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt index 66fd143dd0e..87b7fdac63c 100644 --- a/ext/date/tests/checkdate_variation3.phpt +++ b/ext/date/tests/checkdate_variation3.phpt @@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to third --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index a37dd67412a..edf84d61f80 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_add() function : basic functionality +Test date_add() function : basic functionality --CREDITS-- Felix De Vliegher --FILE-- diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt index ce79f62e627..2b94ac34e7f 100644 --- a/ext/date/tests/date_basic1.phpt +++ b/ext/date/tests/date_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date() function : basic functionality +Test date() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt index 08e4ca7356c..32495913b7f 100644 --- a/ext/date/tests/date_create_variation2.phpt +++ b/ext/date/tests/date_create_variation2.phpt @@ -10,7 +10,7 @@ Test date_create() function : usage variation - Passing unexpected values to sec echo "*** Testing date_create() : usage variation - unexpected values to second argument \$timezone***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt index 9783d4d8800..d24815f99ce 100644 --- a/ext/date/tests/date_date_set_basic1.phpt +++ b/ext/date/tests/date_date_set_basic1.phpt @@ -1,14 +1,14 @@ --TEST-- -Test date_date_set() function : basic functionality +Test date_date_set() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt index d11582de62a..6522b7a7e81 100644 --- a/ext/date/tests/date_date_set_variation2.phpt +++ b/ext/date/tests/date_date_set_variation2.phpt @@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to s --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt index 9af0a109348..c63a339cc76 100644 --- a/ext/date/tests/date_date_set_variation3.phpt +++ b/ext/date/tests/date_date_set_variation3.phpt @@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to t --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt index 1fa25e1b0c6..167cbf01642 100644 --- a/ext/date/tests/date_error.phpt +++ b/ext/date/tests/date_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date() function : error conditions +Test date() function : error conditions --FILE-- -===DONE=== +===DONE=== --EXPECTF-- *** Testing date() : error conditions *** diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt index cb92362ed5a..317386f3113 100644 --- a/ext/date/tests/date_format_basic1.phpt +++ b/ext/date/tests/date_format_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_format() function : basic functionality +Test date_format() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_format_variation2.phpt b/ext/date/tests/date_format_variation2.phpt index ce14f3499b5..136d3d4558e 100644 --- a/ext/date/tests/date_format_variation2.phpt +++ b/ext/date/tests/date_format_variation2.phpt @@ -10,7 +10,7 @@ Test date_format() function : usage variation - Passing unexpected values to sec echo "*** Testing date_format() : usage variation - unexpected values to second argument \$format***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt index 318bf3d629e..1333f747ebd 100644 --- a/ext/date/tests/date_interval_create_from_date_string.phpt +++ b/ext/date/tests/date_interval_create_from_date_string.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_interval_create_from_date_string() function : basic functionality +Test date_interval_create_from_date_string() function : basic functionality --CREDITS-- Rodrigo Prado de Jesus --FILE-- diff --git a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt index 526b474e47c..bb7bf94ce2d 100644 --- a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt +++ b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_interval_create_from_date_string() function : null parameter +Test date_interval_create_from_date_string() function : null parameter --CREDITS-- Rodrigo Prado de Jesus --FILE-- diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt index 2764ce8dba9..80149f4325e 100644 --- a/ext/date/tests/date_isodate_set_basic1.phpt +++ b/ext/date/tests/date_isodate_set_basic1.phpt @@ -1,16 +1,16 @@ --TEST-- -Test date_isodate_set() function : basic functionality +Test date_isodate_set() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt index 8512fbe1ca8..adb4c5d34dc 100644 --- a/ext/date/tests/date_isodate_set_variation2.phpt +++ b/ext/date/tests/date_isodate_set_variation2.phpt @@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt index 829741ad66a..61e973efc4d 100644 --- a/ext/date/tests/date_isodate_set_variation3.phpt +++ b/ext/date/tests/date_isodate_set_variation3.phpt @@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt index ff11405126b..61de2be6cd0 100644 --- a/ext/date/tests/date_isodate_set_variation4.phpt +++ b/ext/date/tests/date_isodate_set_variation4.phpt @@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt index b841f285191..2d9d828db0a 100644 --- a/ext/date/tests/date_modify_basic1.phpt +++ b/ext/date/tests/date_modify_basic1.phpt @@ -1,14 +1,14 @@ --TEST-- -Test date_modify() function : basic functionality +Test date_modify() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt index 21ea733c694..f2a87ce7255 100644 --- a/ext/date/tests/date_modify_variation2.phpt +++ b/ext/date/tests/date_modify_variation2.phpt @@ -3,14 +3,14 @@ Test date_modify() function : usage variation - Passing unexpected values to sec --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt index e11728423b3..4a92eff376c 100644 --- a/ext/date/tests/date_offset_get_basic1.phpt +++ b/ext/date/tests/date_offset_get_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_offset_get() function : basic functionality +Test date_offset_get() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_parse_basic1.phpt b/ext/date/tests/date_parse_basic1.phpt index b1d1701537e..a0801d70644 100644 --- a/ext/date/tests/date_parse_basic1.phpt +++ b/ext/date/tests/date_parse_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_parse() function : basic functionality +Test date_parse() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index 19b4a20eac6..7246ef6347e 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_sub() function : basic functionality +Test date_sub() function : basic functionality --CREDITS-- Felix De Vliegher --FILE-- diff --git a/ext/date/tests/date_sunrise_error.phpt b/ext/date/tests/date_sunrise_error.phpt index f57b7ed1c26..d420bfa293e 100644 --- a/ext/date/tests/date_sunrise_error.phpt +++ b/ext/date/tests/date_sunrise_error.phpt @@ -1,9 +1,9 @@ --TEST-- -Test date_sunrise() function : error conditions +Test date_sunrise() function : error conditions --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt index c79b67f48cc..6892a1b7472 100644 --- a/ext/date/tests/date_time_set_variation2.phpt +++ b/ext/date/tests/date_time_set_variation2.phpt @@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to s --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt index 6c7e5924c34..0d1315d8e37 100644 --- a/ext/date/tests/date_time_set_variation3.phpt +++ b/ext/date/tests/date_time_set_variation3.phpt @@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to t --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt index c0485146cd8..8f8fdd7de69 100644 --- a/ext/date/tests/date_time_set_variation4.phpt +++ b/ext/date/tests/date_time_set_variation4.phpt @@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to f --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index 34fc273d2be..7e0f32a6ca6 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_timezone_get() function : basic functionality +Test date_timezone_get() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index 6df429b3a97..b38354dae0e 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test date_timezone_set() function : basic functionality +Test date_timezone_set() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt index d96f8dd6b71..2c17c255b03 100644 --- a/ext/date/tests/date_timezone_set_variation2.phpt +++ b/ext/date/tests/date_timezone_set_variation2.phpt @@ -10,7 +10,7 @@ Test date_timezone_set() function : usage variation - Passing unexpected values echo "*** Testing date_timezone_set() : usage variation - unexpected values to second argument \$timezone***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt index cdbb1b17933..0a3b9d41896 100644 --- a/ext/date/tests/date_variation1.phpt +++ b/ext/date/tests/date_variation1.phpt @@ -9,7 +9,7 @@ Test date() function : usage variation - Passing unexpected values to first argu echo "*** Testing date() : usage variation - unexpected values to first argument \$format***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt index a9652b4b596..10a9f887934 100644 --- a/ext/date/tests/date_variation2.phpt +++ b/ext/date/tests/date_variation2.phpt @@ -9,7 +9,7 @@ Test date() function : usage variation - Passing unexpected values to second arg echo "*** Testing date() : usage variation - unexpected values to second argument \$timestamp***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/getdate_basic.phpt b/ext/date/tests/getdate_basic.phpt index 5d6cc815dcd..eed29c6e4b2 100644 --- a/ext/date/tests/getdate_basic.phpt +++ b/ext/date/tests/getdate_basic.phpt @@ -1,15 +1,15 @@ --TEST-- -Test getdate() function : basic functionality +Test getdate() function : basic functionality --FILE-- "%a", 'Full weekday name' => "%A", 'Week number of the year' => "%U", - 'Week number of the year in decimal number' => "%W", + 'Week number of the year in decimal number' => "%W", ); // loop through each element of the array for timestamp diff --git a/ext/date/tests/gmstrftime_variation4.phpt b/ext/date/tests/gmstrftime_variation4.phpt index beb553a3163..3ec4e06e176 100644 --- a/ext/date/tests/gmstrftime_variation4.phpt +++ b/ext/date/tests/gmstrftime_variation4.phpt @@ -3,7 +3,7 @@ Test gmstrftime() function : usage variation - Passing month related format stri --FILE-- "%y", 'Year as decimal number including the century' => "%Y", - 'Time zone offset' => "%Z", + 'Time zone offset' => "%Z", 'Time zone offset' => "%z", ); diff --git a/ext/date/tests/gmstrftime_variation6.phpt b/ext/date/tests/gmstrftime_variation6.phpt index beb6e26bde1..f09df7847b9 100644 --- a/ext/date/tests/gmstrftime_variation6.phpt +++ b/ext/date/tests/gmstrftime_variation6.phpt @@ -3,7 +3,7 @@ Test gmstrftime() function : usage variation - Passing time related format strin --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt index 2c0ab358644..dafb7a0aa08 100644 --- a/ext/date/tests/mktime_variation2.phpt +++ b/ext/date/tests/mktime_variation2.phpt @@ -10,7 +10,7 @@ Test mktime() function : usage variation - Passing unexpected values to second a echo "*** Testing mktime() : usage variation - unexpected values to second argument \$minute***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt index 4f1cbcc3e58..e610a13b3c5 100644 --- a/ext/date/tests/mktime_variation3.phpt +++ b/ext/date/tests/mktime_variation3.phpt @@ -10,7 +10,7 @@ Test mktime() function : usage variation - Passing unexpected values to third ar echo "*** Testing mktime() : usage variation - unexpected values to third argument \$second***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt index 1a398d090eb..5cd39dd0ec3 100644 --- a/ext/date/tests/mktime_variation4.phpt +++ b/ext/date/tests/mktime_variation4.phpt @@ -10,7 +10,7 @@ Test mktime() function : usage variation - Passing unexpected values to forth ar echo "*** Testing mktime() : usage variation - unexpected values to forth argument \$month***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt index 81fcb2c44a4..526d74d8961 100644 --- a/ext/date/tests/mktime_variation5.phpt +++ b/ext/date/tests/mktime_variation5.phpt @@ -10,7 +10,7 @@ Test mktime() function : usage variation - Passing unexpected values to fifth ar echo "*** Testing mktime() : usage variation - unexpected values to fifth argument \$day***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt index 28c097ad8c5..cf3617039c1 100644 --- a/ext/date/tests/mktime_variation6.phpt +++ b/ext/date/tests/mktime_variation6.phpt @@ -10,7 +10,7 @@ Test mktime() function : usage variation - Passing unexpected values to sixth ar echo "*** Testing mktime() : usage variation - unexpected values to sixth argument \$year***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/strftime_basic.phpt b/ext/date/tests/strftime_basic.phpt index ddc02dc6121..340ac99e229 100644 --- a/ext/date/tests/strftime_basic.phpt +++ b/ext/date/tests/strftime_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test strftime() function : basic functionality +Test strftime() function : basic functionality --FILE-- "%a", 'Full weekday name' => "%A", 'Week number of the year' => "%U", - 'Week number of the year in decimal number' => "%W", + 'Week number of the year in decimal number' => "%W", ); // loop through each element of the array for timestamp diff --git a/ext/date/tests/strftime_variation4.phpt b/ext/date/tests/strftime_variation4.phpt index 366853ee41c..54df26a1c60 100644 --- a/ext/date/tests/strftime_variation4.phpt +++ b/ext/date/tests/strftime_variation4.phpt @@ -3,7 +3,7 @@ Test strftime() function : usage variation - Passing month related format string --FILE-- "%y", 'Year as decimal number including the century' => "%Y", - 'Time zone offset' => "%Z", + 'Time zone offset' => "%Z", 'Time zone offset' => "%z", ); diff --git a/ext/date/tests/strftime_variation6.phpt b/ext/date/tests/strftime_variation6.phpt index 28acdeb9334..f4413c6c79b 100644 --- a/ext/date/tests/strftime_variation6.phpt +++ b/ext/date/tests/strftime_variation6.phpt @@ -3,7 +3,7 @@ Test strftime() function : usage variation - Passing time related format strings --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt index 8c68f05a95e..952dc0008a5 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation2.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt @@ -10,7 +10,7 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v echo "*** Testing timezone_name_from_abbr() : usage variation - unexpected values to second argument \$gmtOffset***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt index f5b46dd10e6..901ff8cbf7b 100644 --- a/ext/date/tests/timezone_name_from_abbr_variation3.phpt +++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt @@ -10,7 +10,7 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v echo "*** Testing timezone_name_from_abbr() : usage variation - unexpected values to third argument \$isdst***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -90,7 +90,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt index fd9763480c7..e413017be43 100644 --- a/ext/date/tests/timezone_name_get_error.phpt +++ b/ext/date/tests/timezone_name_get_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test timezone_name_get() function : error conditions +Test timezone_name_get() function : error conditions --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt index 88bb2ceb016..6a764405e6f 100644 --- a/ext/date/tests/timezone_offset_get_variation2.phpt +++ b/ext/date/tests/timezone_offset_get_variation2.phpt @@ -10,7 +10,7 @@ Test timezone_offset_get() function : usage variation - Passing unexpected value echo "*** Testing timezone_offset_get() : usage variation - unexpected values to second argument \$datetime***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); set_error_handler('handler'); @@ -99,7 +99,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_open_basic1.phpt b/ext/date/tests/timezone_open_basic1.phpt index abd016b35a5..ee54b5feb48 100644 --- a/ext/date/tests/timezone_open_basic1.phpt +++ b/ext/date/tests/timezone_open_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test timezone_open() function : basic functionality +Test timezone_open() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index a7a191df31e..3189e350741 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test timezone_transitions_get() function : basic functionality +Test timezone_transitions_get() function : basic functionality --FILE-- @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt index 02f9ab84832..a3d6db912f7 100644 --- a/ext/date/tests/timezone_transitions_get_variation2.phpt +++ b/ext/date/tests/timezone_transitions_get_variation2.phpt @@ -10,7 +10,7 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected echo "*** Testing timezone_transitions_get() : usage variation - unexpected values to first argument \$timestamp_begin ***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt index 1e136251e36..5d793acdfc1 100644 --- a/ext/date/tests/timezone_transitions_get_variation3.phpt +++ b/ext/date/tests/timezone_transitions_get_variation3.phpt @@ -10,7 +10,7 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected echo "*** Testing timezone_transitions_get() : usage variation - unexpected values to first argument \$timestamp_end ***\n"; -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); //get an unset variable @@ -91,7 +91,7 @@ $inputs = array( // unset data 'unset var' => @$unset_var, - // resource + // resource 'resource' => $file_handle ); diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt index ae7af9af861..ba0ac00715b 100644 --- a/ext/date/tests/timezone_version_get_basic1.phpt +++ b/ext/date/tests/timezone_version_get_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -timezone_version_get: Test that timezone_location_get returns a date concatenated with a dot and a version number +timezone_version_get: Test that timezone_location_get returns a date concatenated with a dot and a version number --CREDITS-- Rodrigo Wanderley de Melo Cardoso #PHPTestFest2014 São Paulo 2014-07-05 diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt index 05ad1022dec..ca174d7926e 100644 --- a/ext/dom/tests/DOMAttr_value_basic_001.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Read empty $value. +Read empty $value. --CREDITS-- Jason Bouffard # TestFest Atlanta 2009-05-14 diff --git a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt index fbce3c75270..21540161428 100644 --- a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt +++ b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt @@ -2,7 +2,7 @@ __construct() with no arguments. --CREDITS-- Nic Rosental nicrosental@gmail.com -# TestFest Atlanta 2009-5-14 +# TestFest Atlanta 2009-5-14 --SKIPIF-- --FILE-- diff --git a/ext/dom/tests/DOMCharacterData_data_basic_002.phpt b/ext/dom/tests/DOMCharacterData_data_basic_002.phpt index 394b316fa3a..f96791150a9 100644 --- a/ext/dom/tests/DOMCharacterData_data_basic_002.phpt +++ b/ext/dom/tests/DOMCharacterData_data_basic_002.phpt @@ -2,7 +2,7 @@ Create CDATA section and change it using DOMcreateCDATASection --CREDITS-- Nic Rosental nicrosental@gmail.com -# TestFest Atlanta 2009-5-28 +# TestFest Atlanta 2009-5-28 --SKIPIF-- --FILE-- diff --git a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt index b9d73e18198..8b924f04d53 100644 --- a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt +++ b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt @@ -1,8 +1,8 @@ --TEST-- -__DOMCharacterData::substringData pull mid section of string +__DOMCharacterData::substringData pull mid section of string --CREDITS-- Nic Rosental nicrosental@gmail.com -# TestFest Atlanta 2009-5-28 +# TestFest Atlanta 2009-5-28 --SKIPIF-- --FILE-- diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt index 4dd181b3f8b..4e00fbb8d88 100644 --- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt +++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt @@ -1,7 +1,7 @@ --TEST-- DomDocument::createAttribute() - basic test for DomDocument::createAttribute() --CREDITS-- -Muhammad Khalid Adnan +Muhammad Khalid Adnan # TestFest 2008 --SKIPIF-- diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt index 839bd0f9234..b1b2a7139bc 100644 --- a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMDocument::loadHTML +DOMDocument::loadHTML --CREDITS-- Frank Cassedanne franck@ouarz.net #London TestFest 2008 diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt index 5a2f46e2200..a752a195707 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::loadXML() detects not-well formed XML +Test DOMDocument::loadXML() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects an opening and ending tag mismatch +This test verifies the method detects an opening and ending tag mismatch Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_loadXML_error2.phpt b/ext/dom/tests/DOMDocument_loadXML_error2.phpt index 3b8e2b48b16..6d56a317ed7 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error2.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DOMDocument::loadXML() detects not-well formed XML +Test DOMDocument::loadXML() detects not-well formed XML --DESCRIPTION-- This test verifies the method detects attributes values not closed between " or ' Environment variables used in the test: diff --git a/ext/dom/tests/DOMDocument_loadXML_error3.phpt b/ext/dom/tests/DOMDocument_loadXML_error3.phpt index be37b5552b8..834428e32c5 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error3.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DOMDocument::loadXML() detects not-well formed XML +Test DOMDocument::loadXML() detects not-well formed XML --DESCRIPTION-- This test verifies the method detects a typo in tag names Environment variables used in the test: diff --git a/ext/dom/tests/DOMDocument_loadXML_error4.phpt b/ext/dom/tests/DOMDocument_loadXML_error4.phpt index d2cc3c5dd22..1489f143fab 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error4.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DOMDocument::loadXML() detects not-well formed XML +Test DOMDocument::loadXML() detects not-well formed XML --DESCRIPTION-- This test verifies the method detects an unsupported xml version Environment variables used in the test: diff --git a/ext/dom/tests/DOMDocument_loadXML_error5.phpt b/ext/dom/tests/DOMDocument_loadXML_error5.phpt index d5eaadb06d9..221a378760d 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error5.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error5.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::loadXML() detects not-well formed XML +Test DOMDocument::loadXML() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects extra content at the end of the document +This test verifies the method detects extra content at the end of the document Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_load_error1.phpt b/ext/dom/tests/DOMDocument_load_error1.phpt index 4f68d46dd5c..d3401b3972c 100644 --- a/ext/dom/tests/DOMDocument_load_error1.phpt +++ b/ext/dom/tests/DOMDocument_load_error1.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::load() detects not-well formed XML +Test DOMDocument::load() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects an opening and ending tag mismatch +This test verifies the method detects an opening and ending tag mismatch Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_load_error2.phpt b/ext/dom/tests/DOMDocument_load_error2.phpt index ee8a96fc064..f450cf16545 100644 --- a/ext/dom/tests/DOMDocument_load_error2.phpt +++ b/ext/dom/tests/DOMDocument_load_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test DOMDocument::load() detects not-well formed XML +Test DOMDocument::load() detects not-well formed XML --DESCRIPTION-- This test verifies the method detects attributes values not closed between " or ' Environment variables used in the test: diff --git a/ext/dom/tests/DOMDocument_load_error3.phpt b/ext/dom/tests/DOMDocument_load_error3.phpt index 1e0438b257b..b3d70a94d04 100644 --- a/ext/dom/tests/DOMDocument_load_error3.phpt +++ b/ext/dom/tests/DOMDocument_load_error3.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::load() detects not-well formed XML +Test DOMDocument::load() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects and opening and ending tag mismatch +This test verifies the method detects and opening and ending tag mismatch Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_load_error4.phpt b/ext/dom/tests/DOMDocument_load_error4.phpt index 6fcaff82ff2..9c8e825cc72 100644 --- a/ext/dom/tests/DOMDocument_load_error4.phpt +++ b/ext/dom/tests/DOMDocument_load_error4.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::load() detects not-well formed XML +Test DOMDocument::load() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects an unsupported xml version +This test verifies the method detects an unsupported xml version Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_load_error5.phpt b/ext/dom/tests/DOMDocument_load_error5.phpt index e9b89cb0bf1..cd1875f906c 100644 --- a/ext/dom/tests/DOMDocument_load_error5.phpt +++ b/ext/dom/tests/DOMDocument_load_error5.phpt @@ -1,7 +1,7 @@ --TEST-- -Test DOMDocument::load() detects not-well formed XML +Test DOMDocument::load() detects not-well formed XML --DESCRIPTION-- -This test verifies the method detects extra content at the end of the document +This test verifies the method detects extra content at the end of the document Environment variables used in the test: - XML_FILE: the xml file to load - LOAD_OPTIONS: the second parameter to pass to the method diff --git a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt index c8ce0602f20..8675b957a1f 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMDocument::saveHTML() should dump the internal document into a string using HTML formatting +DOMDocument::saveHTML() should dump the internal document into a string using HTML formatting --CREDITS-- Knut Urdalen #PHPTestFest2009 Norway 2009-06-09 \o/ diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt index c5728860c8e..ef51e7f1266 100644 --- a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt +++ b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt @@ -1,5 +1,5 @@ --TEST-- -DOMDocument::saveHTML() optional parameters +DOMDocument::saveHTML() optional parameters --SKIPIF-- # TestFest 2009 NYPHP diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt index 1055d64f1d6..8d1c10efec0 100644 --- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt +++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt @@ -9,7 +9,7 @@ include('skipif.inc'); /* Create an XML document * with strcuture - * + * * This is the title * * Check for child nodes of the , and This is the title diff --git a/ext/dom/tests/DOMNode_insertBefore_error2.phpt b/ext/dom/tests/DOMNode_insertBefore_error2.phpt index 835dfa065ab..fbe212d4b90 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error2.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error2.phpt @@ -2,7 +2,7 @@ Test DOMNode::insertBefore() check the error code DOM_NOT_FOUND is raised --DESCRIPTION-- DOMNode::insertBefore(newNode, [refNode]) -DOM_NOT_FOUND is raised if refnode is not a child +DOM_NOT_FOUND is raised if refnode is not a child This test checks the error message is raised when the refnode is a sibling --CREDITS-- Antonio Diaz Ruiz <dejalatele@gmail.com> diff --git a/ext/dom/tests/DOMNode_insertBefore_error3.phpt b/ext/dom/tests/DOMNode_insertBefore_error3.phpt index a3bad5433e7..a8b4e45494a 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error3.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error3.phpt @@ -2,7 +2,7 @@ Test DOMNode::insertBefore() check the error code DOM_NOT_FOUND is raised --DESCRIPTION-- DOMNode::insertBefore(newNode, [refNode]) -DOM_NOT_FOUND is raised if refnode is not a child +DOM_NOT_FOUND is raised if refnode is not a child This test checks the error message is raised when refnode is the parent node --CREDITS-- Antonio Diaz Ruiz <dejalatele@gmail.com> diff --git a/ext/dom/tests/DOMNode_insertBefore_error4.phpt b/ext/dom/tests/DOMNode_insertBefore_error4.phpt index a8d12914e3d..5b1fc3150ae 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error4.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error4.phpt @@ -2,7 +2,7 @@ Test DOMNode::insertBefore() check the error code DOM_NOT_FOUND is raised --DESCRIPTION-- DOMNode::insertBefore(newNode, [refNode]) -DOM_NOT_FOUND is raised if refnode is not a child +DOM_NOT_FOUND is raised if refnode is not a child This test checks the error message is raised when the refnode is a brand new node --CREDITS-- Antonio Diaz Ruiz <dejalatele@gmail.com> diff --git a/ext/dom/tests/DOMNode_insertBefore_error5.phpt b/ext/dom/tests/DOMNode_insertBefore_error5.phpt index c41a9edfbb2..f5bcf098e79 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error5.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error5.phpt @@ -2,8 +2,8 @@ Test DOMNode::insertBefore() check the error code DOM_NOT_FOUND is raised --DESCRIPTION-- DOMNode::insertBefore(newNode, [refNode]) -DOM_NOT_FOUND is raised if refnode is not a child -This test checks the error message is raised when the refnode is a descendant but not a child +DOM_NOT_FOUND is raised if refnode is not a child +This test checks the error message is raised when the refnode is a descendant but not a child --CREDITS-- Antonio Diaz Ruiz <dejalatele@gmail.com> --INI-- diff --git a/ext/dom/tests/DOMNode_insertBefore_error6.phpt b/ext/dom/tests/DOMNode_insertBefore_error6.phpt index 99c72f86214..5afecafed74 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error6.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error6.phpt @@ -2,7 +2,7 @@ Test DOMNode::insertBefore() check the error code DOM_NOT_FOUND is raised --DESCRIPTION-- DOMNode::insertBefore(newNode, [refNode]) -DOM_NOT_FOUND is raised if refnode is not a child +DOM_NOT_FOUND is raised if refnode is not a child This test checks the error message is raised when the refnode is the parent --CREDITS-- Antonio Diaz Ruiz <dejalatele@gmail.com> diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt index 11575819a6f..8908aba55d6 100644 --- a/ext/dom/tests/canonicalization.phpt +++ b/ext/dom/tests/canonicalization.phpt @@ -39,12 +39,12 @@ echo $doc->c14N(TRUE, FALSE, array('query'=>'(//. | //@* | //namespace::*)'))."\ /* exclusive/without comments first child element of doc element is context. using xpath query with registered namespace. test namespace prefix is also included. */ -echo $doc->c14N(TRUE, FALSE, +echo $doc->c14N(TRUE, FALSE, array('query'=>'(//a:contain | //a:bar | .//namespace::*)', - 'namespaces'=>array('a'=>'http://www.example.com/ns/foo')), + 'namespaces'=>array('a'=>'http://www.example.com/ns/foo')), array('test'))."\n\n"; -/* exclusive/without comments first child element of doc element is context. +/* exclusive/without comments first child element of doc element is context. test namespace prefix is also included */ echo $doc->C14N(TRUE, FALSE, NULL, array('test')); ?> diff --git a/ext/dom/tests/dom_create_element.phpt b/ext/dom/tests/dom_create_element.phpt index 3f307099bb1..bd2c8f11dae 100644 --- a/ext/dom/tests/dom_create_element.phpt +++ b/ext/dom/tests/dom_create_element.phpt @@ -221,7 +221,7 @@ try { print $e->getMessage() . "\n"; } -/* the qualifiedName has a prefix that is "xml" and the namespaceURI +/* the qualifiedName has a prefix that is "xml" and the namespaceURI is different from "http://www.w3.org/XML/1998/namespace" [XML Namespaces] */ print "26 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xml:valid')\n"; @@ -261,7 +261,7 @@ try { } -/* the qualifiedName or its prefix is "xmlns" and the namespaceURI is +/* the qualifiedName or its prefix is "xmlns" and the namespaceURI is different from "http://www.w3.org/2000/xmlns/" */ print "30 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xmlns:valid')\n"; @@ -298,7 +298,7 @@ try { print $e->getMessage() . "\n"; } -/* the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the +/* the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the qualifiedName nor its prefix is "xmlns". */ print "34 DOMDocument::createElementNS('http://www.w3.org/2000/xmlns/', 'wrongprefix:valid')\n"; diff --git a/ext/dom/tests/domdocument_createentityreference_001.phpt b/ext/dom/tests/domdocument_createentityreference_001.phpt index 7343e74cfd2..9a43599914e 100644 --- a/ext/dom/tests/domdocument_createentityreference_001.phpt +++ b/ext/dom/tests/domdocument_createentityreference_001.phpt @@ -7,7 +7,7 @@ Clint Priest @ PhpTek09 --FILE-- <?php $objDoc = new DomDocument(); - + $objRef = $objDoc->createEntityReference('Test'); echo $objRef->nodeName . "\n"; ?> diff --git a/ext/dom/tests/domdocument_createentityreference_002.phpt b/ext/dom/tests/domdocument_createentityreference_002.phpt index a2416c2d89d..90754100ddb 100644 --- a/ext/dom/tests/domdocument_createentityreference_002.phpt +++ b/ext/dom/tests/domdocument_createentityreference_002.phpt @@ -7,7 +7,7 @@ Clint Priest @ PhpTek09 --FILE-- <?php $objDoc = new DomDocument(); - + $objRef = $objDoc->createEntityReference(); ?> ===DONE=== diff --git a/ext/enchant/tests/enchant_broker_set_dict_path.phpt b/ext/enchant/tests/enchant_broker_set_dict_path.phpt index 3911a7fe4ce..db35288a42c 100644 --- a/ext/enchant/tests/enchant_broker_set_dict_path.phpt +++ b/ext/enchant/tests/enchant_broker_set_dict_path.phpt @@ -27,7 +27,7 @@ if (is_resource($broker)) { echo("OK\n"); if ( - (enchant_broker_get_dict_path($broker,$dictTypeValue1) == $backEndDictType1) && + (enchant_broker_get_dict_path($broker,$dictTypeValue1) == $backEndDictType1) && (enchant_broker_get_dict_path($broker,$dictTypeValue2) == $backEndDictType2) ) { echo("OK\n"); diff --git a/ext/exif/tests/bug34704-mb.phpt b/ext/exif/tests/bug34704-mb.phpt index 05c50b3a5a8..8185eb319cd 100644 --- a/ext/exif/tests/bug34704-mb.phpt +++ b/ext/exif/tests/bug34704-mb.phpt @@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug34704私はガラスを食べられます.jpg'; diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt index 7688ce861af..ebe05fb8787 100644 --- a/ext/exif/tests/bug34704.phpt +++ b/ext/exif/tests/bug34704.phpt @@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug34704.jpg'; diff --git a/ext/exif/tests/bug50660/bug50660.phpt b/ext/exif/tests/bug50660/bug50660.phpt index 00a83ce4b0c..e523921ebde 100644 --- a/ext/exif/tests/bug50660/bug50660.phpt +++ b/ext/exif/tests/bug50660/bug50660.phpt @@ -4,7 +4,7 @@ Bug #50660 (exif_read_data(): Illegal IFD offset (works fine with other exif rea <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug50660-1.jpg'; diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt index be01998fd8e..2f39c115118 100644 --- a/ext/exif/tests/bug60150.phpt +++ b/ext/exif/tests/bug60150.phpt @@ -4,7 +4,7 @@ Bug #60150 (Integer overflow during the parsing of invalid exif header) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug60150.jpg'; diff --git a/ext/exif/tests/bug72819/bug72819.phpt b/ext/exif/tests/bug72819/bug72819.phpt index f71fa316632..d99a15c1972 100644 --- a/ext/exif/tests/bug72819/bug72819.phpt +++ b/ext/exif/tests/bug72819/bug72819.phpt @@ -4,7 +4,7 @@ Bug #72819 (EXIF thumbnails not read anymore) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug72819.jpg'; diff --git a/ext/exif/tests/bug73115/bug73115.phpt b/ext/exif/tests/bug73115/bug73115.phpt index 969ddebe9f4..9ce3818e591 100644 --- a/ext/exif/tests/bug73115/bug73115.phpt +++ b/ext/exif/tests/bug73115/bug73115.phpt @@ -4,7 +4,7 @@ Bug #73115 (exif_read_data triggers warning on reading binary strings) <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug73115.jpg'; diff --git a/ext/exif/tests/bug74428/bug74428.phpt b/ext/exif/tests/bug74428/bug74428.phpt index b2beca3f21b..24911084e42 100644 --- a/ext/exif/tests/bug74428/bug74428.phpt +++ b/ext/exif/tests/bug74428/bug74428.phpt @@ -4,7 +4,7 @@ Bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with correct exi <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php $infile = dirname(__FILE__).'/bug74428.jpg'; diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt index 2a70f2920c9..7f78ef28135 100644 --- a/ext/exif/tests/exif002.phpt +++ b/ext/exif/tests/exif002.phpt @@ -4,7 +4,7 @@ Check for exif_thumbnail <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- output_handler= -zlib.output_compression=0 +zlib.output_compression=0 --FILE-- <?php /* diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt index 20cb61ee171..d0a1b7b3ba0 100644 --- a/ext/exif/tests/exif003.phpt +++ b/ext/exif/tests/exif003.phpt @@ -1,7 +1,7 @@ --TEST-- Check for exif_read_data, Unicode user comment --SKIPIF-- -<?php +<?php if (!extension_loaded('exif')) die('skip exif extension not available'); if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl'); diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt index 356c10aa870..fd941cc4d4e 100644 --- a/ext/exif/tests/exif004.phpt +++ b/ext/exif/tests/exif004.phpt @@ -1,5 +1,5 @@ --TEST-- -Check for exif_read_data, Unicode WinXP tags +Check for exif_read_data, Unicode WinXP tags --SKIPIF-- <?php if (!extension_loaded('exif')) die('skip exif extension not available'); diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt index 989d02b6a49..59c9b8d12c7 100644 --- a/ext/exif/tests/exif_imagetype_error.phpt +++ b/ext/exif/tests/exif_imagetype_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test exif_imagetype() function : error conditions +Test exif_imagetype() function : error conditions --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- diff --git a/ext/exif/tests/exif_tagname_basic.phpt b/ext/exif/tests/exif_tagname_basic.phpt index e33601197b3..82bd06ebabc 100644 --- a/ext/exif/tests/exif_tagname_basic.phpt +++ b/ext/exif/tests/exif_tagname_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test exif_tagname() function : basic functionality +Test exif_tagname() function : basic functionality --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --INI-- diff --git a/ext/exif/tests/exif_tagname_error.phpt b/ext/exif/tests/exif_tagname_error.phpt index ed1f2fdc3a5..2408ad5ce8b 100644 --- a/ext/exif/tests/exif_tagname_error.phpt +++ b/ext/exif/tests/exif_tagname_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test exif_tagname() function : error conditions +Test exif_tagname() function : error conditions --SKIPIF-- <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> --FILE-- diff --git a/ext/exif/tests/sony.phpt b/ext/exif/tests/sony.phpt index 683d58d4ac1..8c2bf7c58cf 100644 --- a/ext/exif/tests/sony.phpt +++ b/ext/exif/tests/sony.phpt @@ -10,7 +10,7 @@ if (!$data) { exit('Error: Unable to parse EXIF data'); } -// Perhaps we should just test for SonyModelID since it seems to be +// Perhaps we should just test for SonyModelID since it seems to be // the most specific tag name that should be found in any Sony generated // picture foreach (['SonyModelID', 'Panorama', 'AntiBlur'] as $sony_tag) { diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt index 0c0a3644692..40e38eeaaaa 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_buffer() function : basic functionality +Test finfo_buffer() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - * Description: Return infromation about a string buffer. + * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt index ee617d2565f..42ae0dc1e0b 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_buffer() function : basic functionality +Test finfo_buffer() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - * Description: Return infromation about a string buffer. + * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_buffer_error.phpt b/ext/fileinfo/tests/finfo_buffer_error.phpt index 6a3d463d715..3e74d71ef99 100644 --- a/ext/fileinfo/tests/finfo_buffer_error.phpt +++ b/ext/fileinfo/tests/finfo_buffer_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_buffer() function : error conditions +Test finfo_buffer() function : error conditions --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - * Description: Return infromation about a string buffer. + * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt index 2eb9a40b28f..5b2530361bd 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_buffer() function : basic functionality +Test finfo_buffer() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - * Description: Return infromation about a string buffer. + * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt index 2882a337ccf..e6363d838d5 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_buffer() function : basic functionality +Test finfo_buffer() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]]) - * Description: Return infromation about a string buffer. + * Description: Return infromation about a string buffer. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt index d6b00dbd42e..b307b23bef9 100644 --- a/ext/fileinfo/tests/finfo_close_basic.phpt +++ b/ext/fileinfo/tests/finfo_close_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_close() function : basic functionality +Test finfo_close() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : resource finfo_close(resource finfo) - * Description: Close fileinfo resource. + * Description: Close fileinfo resource. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt index fdfc722ef71..374787aa55d 100644 --- a/ext/fileinfo/tests/finfo_close_error.phpt +++ b/ext/fileinfo/tests/finfo_close_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_close() function : error conditions +Test finfo_close() function : error conditions --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : resource finfo_close(resource finfo) - * Description: Close fileinfo resource. + * Description: Close fileinfo resource. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt index 6207eed41f3..ab39dea0700 100644 --- a/ext/fileinfo/tests/finfo_file_basic.phpt +++ b/ext/fileinfo/tests/finfo_file_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_file() function : basic functionality +Test finfo_file() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : string finfo_file(resource finfo, char *file_name [, int options [, resource context]]) - * Description: Return information about a file. + * Description: Return information about a file. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt index 5816de8ef94..887ffb09af7 100644 --- a/ext/fileinfo/tests/finfo_open_basic.phpt +++ b/ext/fileinfo/tests/finfo_open_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_open() function : basic functionality +Test finfo_open() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : resource finfo_open([int options [, string arg]]) - * Description: Create a new fileinfo resource. + * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index 5610d8eeb82..15202e5799c 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_open() function : error functionality +Test finfo_open() function : error functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); --FILE-- <?php /* Prototype : resource finfo_open([int options [, string arg]]) - * Description: Create a new fileinfo resource. + * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_open_variation1.phpt b/ext/fileinfo/tests/finfo_open_variation1.phpt index ee17b2be934..caa6e4abe74 100644 --- a/ext/fileinfo/tests/finfo_open_variation1.phpt +++ b/ext/fileinfo/tests/finfo_open_variation1.phpt @@ -5,7 +5,7 @@ Test finfo_open() function : variations in opening --FILE-- <?php /* Prototype : resource finfo_open([int options [, string arg]]) - * Description: Create a new fileinfo resource. + * Description: Create a new fileinfo resource. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt index d5b6d5130df..615afd40f8e 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_set_flags() function : basic functionality +Test finfo_set_flags() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : bool finfo_set_flags(resource finfo, int options) - * Description: Set libmagic configuration options. + * Description: Set libmagic configuration options. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt index ca2f2de88b0..3b7168a6845 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt @@ -1,11 +1,11 @@ --TEST-- -Test finfo_set_flags() function : basic functionality +Test finfo_set_flags() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --FILE-- <?php /* Prototype : bool finfo_set_flags(resource finfo, int options) - * Description: Set libmagic configuration options. + * Description: Set libmagic configuration options. * Source code: ext/fileinfo/fileinfo.c * Alias to functions: */ diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt index 70b68bbca37..f9c190a0d07 100644 --- a/ext/filter/tests/015.phpt +++ b/ext/filter/tests/015.phpt @@ -6,11 +6,11 @@ filter_var() and FILTER_VALIDATE_URL <?php $values = Array( -'http://example.com/index.html', -'http://www.example.com/index.php', -'http://www.example/img/test.png', -'http://www.example/img/dir/', -'http://www.example/img/dir', +'http://example.com/index.html', +'http://www.example.com/index.php', +'http://www.example/img/test.png', +'http://www.example/img/dir/', +'http://www.example/img/dir', 'http://www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com/', 'http://toolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolong.com', 'http://eauBcFReEmjLcoZwI0RuONNnwU4H9r151juCaqTI5VeIP5jcYIqhx1lh5vV00l2rTs6y7hOp7rYw42QZiq6VIzjcYrRm8gFRMk9U9Wi1grL8Mr5kLVloYLthHgyA94QK3SaXCATklxgo6XvcbXIqAGG7U0KxTr8hJJU1p2ZQ2mXHmp4DhYP8N9SRuEKzaCPcSIcW7uj21jZqBigsLsNAXEzU8SPXZjmVQVtwQATPWeWyGW4GuJhjP4Q8o0.com', @@ -27,19 +27,19 @@ $values = Array( 'http://-.abc.com', 'http://abc.-.abc.com', 'http://underscore_.example.com', -'http//www.example/wrong/url/', -'http:/www.example', -'file:///tmp/test.c', -'ftp://ftp.example.com/tmp/', -'/tmp/test.c', -'/', -'http://', -'http:/', -'http:', -'http', -'', --1, -array(), +'http//www.example/wrong/url/', +'http:/www.example', +'file:///tmp/test.c', +'ftp://ftp.example.com/tmp/', +'/tmp/test.c', +'/', +'http://', +'http:/', +'http:', +'http', +'', +-1, +array(), 'mailto:foo@bar.com', 'news:news.php.net', 'file://foo/bar', diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt index 9f644f671fe..c614903f637 100644 --- a/ext/filter/tests/016.phpt +++ b/ext/filter/tests/016.phpt @@ -5,14 +5,14 @@ filter_var() and FILTER_VALIDATE_EMAIL --FILE-- <?php $values = Array( -'a@b.c', -'abuse@example.com', -'test!.!@#$%^&*@example.com', -'test@@#$%^&*())).com', -'test@.com', -'test@com', -'@', -'[]()/@example.com', +'a@b.c', +'abuse@example.com', +'test!.!@#$%^&*@example.com', +'test@@#$%^&*())).com', +'test@.com', +'test@com', +'@', +'[]()/@example.com', 'QWERTYUIOPASDFGHJKLZXCVBNM@QWERTYUIOPASDFGHJKLZXCVBNM.NET', 'e.x.a.m.p.l.e.@example.com', 'firstname.lastname@employee.2something.com', diff --git a/ext/filter/tests/030.phpt b/ext/filter/tests/030.phpt index 086c4c28869..6c380dee901 100644 --- a/ext/filter/tests/030.phpt +++ b/ext/filter/tests/030.phpt @@ -1,5 +1,5 @@ --TEST-- -filter_var() and IPv6 +filter_var() and IPv6 --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- diff --git a/ext/filter/tests/035.phpt b/ext/filter/tests/035.phpt index e2d3325270c..611c57176ec 100644 --- a/ext/filter/tests/035.phpt +++ b/ext/filter/tests/035.phpt @@ -1,5 +1,5 @@ --TEST-- -GET/POST/REQUEST Test with input_filter +GET/POST/REQUEST Test with input_filter --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --POST-- diff --git a/ext/filter/tests/037.phpt b/ext/filter/tests/037.phpt index f8497c63b05..e9f02afca43 100644 --- a/ext/filter/tests/037.phpt +++ b/ext/filter/tests/037.phpt @@ -23,7 +23,7 @@ $res = filter_input_array(INPUT_GET, array( 'filter' => FILTER_CALLBACK, 'options' => 'myfunc' ), - 'b' => FILTER_VALIDATE_INT + 'b' => FILTER_VALIDATE_INT ) ); diff --git a/ext/filter/tests/056.phpt b/ext/filter/tests/056.phpt index 74f5a2a0115..e3a4570ea78 100644 --- a/ext/filter/tests/056.phpt +++ b/ext/filter/tests/056.phpt @@ -6,7 +6,7 @@ filter_var() and FILTER_VALIDATE_DOMAIN <?php $values = Array( -'example.com', +'example.com', 'www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com', 'toolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolong.com', 'eauBcFReEmjLcoZwI0RuONNnwU4H9r151juCaqTI5VeIP5jcYIqhx1lh5vV00l2rTs6y7hOp7rYw42QZiq6VIzjcYrRm8gFRMk9U9Wi1grL8Mr5kLVloYLthHgyA94QK3SaXCATklxgo6XvcbXIqAGG7U0KxTr8hJJU1p2ZQ2mXHmp4DhYP8N9SRuEKzaCPcSIcW7uj21jZqBigsLsNAXEzU8SPXZjmVQVtwQATPWeWyGW4GuJhjP4Q8o0.com', @@ -19,9 +19,9 @@ $values = Array( '-.abc.com', 'abc.-.abc.com', 'underscore_.example.com', -'', --1, -array(), +'', +-1, +array(), '\r\n', ); foreach ($values as $value) { diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt index 0fce5db3e83..89b3be71045 100644 --- a/ext/filter/tests/bug8315.phpt +++ b/ext/filter/tests/bug8315.phpt @@ -1,5 +1,5 @@ --TEST-- -bug 8315, NULL values halt the validation +bug 8315, NULL values halt the validation --SKIPIF-- <?php if (!extension_loaded("filter")) die("skip"); ?> --FILE-- diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt index 355b8b84691..336594e3167 100644 --- a/ext/ftp/tests/ftp_fget_basic.phpt +++ b/ext/ftp/tests/ftp_fget_basic.phpt @@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY)); fseek($fp, $postition); var_dump(urlencode(fgets($fp))); -//test non-existent file request +//test non-existent file request ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII); //remove file diff --git a/ext/ftp/tests/ftp_mdtm_basic.phpt b/ext/ftp/tests/ftp_mdtm_basic.phpt index 3424bb83445..a52593cbefe 100644 --- a/ext/ftp/tests/ftp_mdtm_basic.phpt +++ b/ext/ftp/tests/ftp_mdtm_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test the File Modification Time as described in http://tools.ietf.org/html/rfc3659#section-3.1 --CREDITS-- -Nathaniel McHugh +Nathaniel McHugh --SKIPIF-- <?php require 'skipif.inc'; diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt index 5f8a96d5522..eac5b630b2c 100644 --- a/ext/gd/tests/bug72339.phpt +++ b/ext/gd/tests/bug72339.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow +Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow --SKIPIF-- <?php if (!function_exists("imagecreatefromgd2")) print "skip"; diff --git a/ext/gd/tests/dashedlines.phpt b/ext/gd/tests/dashedlines.phpt index 66209f47d80..b6d4892c885 100644 --- a/ext/gd/tests/dashedlines.phpt +++ b/ext/gd/tests/dashedlines.phpt @@ -1,5 +1,5 @@ --TEST-- -imageline, dashed +imageline, dashed --SKIPIF-- <?php if (!function_exists('imagecreatefromstring')) die("skip gd extension not available\n"); diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt index 0cbacc33dd0..0e2ea3b514b 100644 --- a/ext/gd/tests/imagearc_basic.phpt +++ b/ext/gd/tests/imagearc_basic.phpt @@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc with white color +//create an arc with white color imagearc($image, 50, 50, 30, 30, 0, 180, $white); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagearc_error1.phpt b/ext/gd/tests/imagearc_error1.phpt index 5437f3da67d..65c582b2553 100644 --- a/ext/gd/tests/imagearc_error1.phpt +++ b/ext/gd/tests/imagearc_error1.phpt @@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc with white color +//create an arc with white color imagearc($image, 50, 50, 30, 30, 0, 180); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt index f84d8d76ecf..3fb2a7d31c8 100644 --- a/ext/gd/tests/imagearc_variation1.phpt +++ b/ext/gd/tests/imagearc_variation1.phpt @@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc with white color +//create an arc with white color imagearc($image, 50, 50, 30, 30, 0, -90, $white); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt index d4b4afefcd2..ad9addf7cdb 100644 --- a/ext/gd/tests/imagearc_variation2.phpt +++ b/ext/gd/tests/imagearc_variation2.phpt @@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc with white color +//create an arc with white color imagearc($image, 50, 50, 30, 30, -90, 0, $white); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt index 518eac74d6c..b584e18634c 100644 --- a/ext/gd/tests/imagecolorallocate_error.phpt +++ b/ext/gd/tests/imagecolorallocate_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imagecolorallocate() function : error conditions +Test imagecolorallocate() function : error conditions --SKIPIF-- <?php if(!extension_loaded('gd')) { diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt index b5c5823e8e0..37d9f95a89b 100644 --- a/ext/gd/tests/imagecolorallocate_variation1.phpt +++ b/ext/gd/tests/imagecolorallocate_variation1.phpt @@ -101,7 +101,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - //resource + //resource "file resource" => $fp ); diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt index aad888e584f..e46e0da9601 100644 --- a/ext/gd/tests/imagecolorallocate_variation2.phpt +++ b/ext/gd/tests/imagecolorallocate_variation2.phpt @@ -96,7 +96,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - //resource + //resource "file resource" => $fp ); // loop through each element of the array for red diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt index 62fafb3c893..cc17bafe0dc 100644 --- a/ext/gd/tests/imagecolorallocate_variation3.phpt +++ b/ext/gd/tests/imagecolorallocate_variation3.phpt @@ -95,7 +95,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - //resource + //resource "file resource" => $fp ); // loop through each element of the array for red diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt index 18a9172be5e..ad8908eeea8 100644 --- a/ext/gd/tests/imagecolorallocate_variation4.phpt +++ b/ext/gd/tests/imagecolorallocate_variation4.phpt @@ -95,7 +95,7 @@ $values = array( // unset data 'unset var' => @$unset_var, - //resource + //resource "file resource" => $fp ); // loop through each element of the array for red diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt index ee74ee974ee..fcb72547124 100644 --- a/ext/gd/tests/imagecolorallocate_variation6.phpt +++ b/ext/gd/tests/imagecolorallocate_variation6.phpt @@ -18,7 +18,7 @@ if(!function_exists('imagecreatetruecolor')) { echo "*** Testing imagecolorallocate() : usage variations ***\n"; $values = array( - //Decimal integera data + //Decimal integera data "Decimal 256" => 256, // octal integer data diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt index 32e4f8a7216..32c175664fb 100644 --- a/ext/gd/tests/imagecolorstotal_basic.phpt +++ b/ext/gd/tests/imagecolorstotal_basic.phpt @@ -19,7 +19,7 @@ if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif' echo "*** Testing imagecolorstotal() : basic functionality ***\n"; -// Get an image +// Get an image $gif = dirname(__FILE__)."/php.gif"; $im = imagecreatefromgif($gif); diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt index 599bfa1ed8c..58405c5c192 100644 --- a/ext/gd/tests/imagecolourstotal_basic.phpt +++ b/ext/gd/tests/imagecolourstotal_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imagecolorstotal() function : basic functionality +Test imagecolorstotal() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --SKIPIF-- @@ -14,7 +14,7 @@ Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- <?php /* Prototype : int imagecolorstotal(resource im) - * Description: Find out the number of colors in an image's palette + * Description: Find out the number of colors in an image's palette * Source code: ext/gd/gd.c * Alias to functions: */ diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt index 619e55af156..77af59c085e 100644 --- a/ext/gd/tests/imagecopyresampled_basic.phpt +++ b/ext/gd/tests/imagecopyresampled_basic.phpt @@ -21,7 +21,7 @@ $dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png'; // create a blank image $image_lge = imagecreatetruecolor(400, 300); -// set the background color to black +// set the background color to black $bg = imagecolorallocate($image_lge, 0, 0, 0); // fill polygon with blue diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt index d58825036c4..bc87c465c6f 100644 --- a/ext/gd/tests/imagedashedline_basic.phpt +++ b/ext/gd/tests/imagedashedline_basic.phpt @@ -22,7 +22,7 @@ $dest = dirname(realpath(__FILE__)) . '/imagedashedline.png'; // create a blank image $image = imagecreatetruecolor(250, 250); -// set the background color to black +// set the background color to black $bg = imagecolorallocate($image, 0, 0, 0); // red dashed lines diff --git a/ext/gd/tests/imageellipse_error7.phpt b/ext/gd/tests/imageellipse_error7.phpt index 612be4b8bbb..0b4c1f549df 100644 --- a/ext/gd/tests/imageellipse_error7.phpt +++ b/ext/gd/tests/imageellipse_error7.phpt @@ -1,8 +1,8 @@ --TEST-- -Testing wrong param passing imageellipse() of GD library +Testing wrong param passing imageellipse() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> -#testfest PHPSP on 2009-06-20 +Ivan Rosolen <contato [at] ivanrosolen [dot] com> +#testfest PHPSP on 2009-06-20 --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); @@ -10,10 +10,10 @@ if (!extension_loaded("gd")) die("skip GD not present"); --FILE-- <?php -// Create a resource +// Create a resource $image = tmpfile(); -// try to draw a white ellipse +// try to draw a white ellipse imageellipse($image, 200, 150, 300, 200, 16777215); ?> --EXPECTF-- diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt index 23b9d3a969d..b353d808e6a 100644 --- a/ext/gd/tests/imagefilledarc_basic.phpt +++ b/ext/gd/tests/imagefilledarc_basic.phpt @@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc and fill it with white color +//create an arc and fill it with white color imagefilledarc($image, 50, 50, 30, 30, 0, 90, $white, IMG_ARC_PIE); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagefilledarc_error1.phpt b/ext/gd/tests/imagefilledarc_error1.phpt index bb14543edae..2ef47150ee3 100644 --- a/ext/gd/tests/imagefilledarc_error1.phpt +++ b/ext/gd/tests/imagefilledarc_error1.phpt @@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc and fill it with white color +//create an arc and fill it with white color imagefilledarc($image, 50, 50, 30, 30, 0, 90, $white); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt index ef4a98ac797..cc6e01b4ad4 100644 --- a/ext/gd/tests/imagefilledarc_variation1.phpt +++ b/ext/gd/tests/imagefilledarc_variation1.phpt @@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc and fill it with white color +//create an arc and fill it with white color imagefilledarc($image, 50, 50, 30, 30, 0, -25, $white, IMG_ARC_PIE); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt index 2965cda65a6..feb81a8e062 100644 --- a/ext/gd/tests/imagefilledarc_variation2.phpt +++ b/ext/gd/tests/imagefilledarc_variation2.phpt @@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an arc and fill it with white color +//create an arc and fill it with white color imagefilledarc($image, 50, 50, 30, 30, -25, 25, $white, IMG_ARC_PIE); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt index ed78dde4d20..ef492510af0 100644 --- a/ext/gd/tests/imagefilledellipse_basic.phpt +++ b/ext/gd/tests/imagefilledellipse_basic.phpt @@ -11,7 +11,7 @@ $image = imagecreatetruecolor(100, 100); $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); -//create an ellipse and fill it with white color +//create an ellipse and fill it with white color imagefilledellipse($image, 50, 50, 40, 30, $white); include_once __DIR__ . '/func.inc'; diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt index cd226179ba3..0f5f9cf335c 100644 --- a/ext/gd/tests/imagefilledpolygon_basic.phpt +++ b/ext/gd/tests/imagefilledpolygon_basic.phpt @@ -23,13 +23,13 @@ $points = array( 60, 60, 240, 20, 50, 40, - 10, 10 + 10, 10 ); // create a blank image $image = imagecreatetruecolor(250, 250); -// set the background color to black +// set the background color to black $bg = imagecolorallocate($image, 0, 0, 0); // fill polygon with green @@ -41,12 +41,12 @@ imagefilledpolygon($image, $points, count($points)/2, $col_poly); // output the picture to a file imagepng($image, $dest); -// get it back +// get it back $image_in = imagecreatefrompng($dest); //check color of a point on edge.. $col1 = imagecolorat($image_in, 40, 50); -//.. a point in filled body +//.. a point in filled body $col2 = imagecolorat($image_in, 15, 15); // ..and a point on background $col3 = imagecolorat($image_in, 5, 5); diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt index e2dfbef2e07..e177918e3ea 100644 --- a/ext/gd/tests/imagefilltoborder_basic.phpt +++ b/ext/gd/tests/imagefilltoborder_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing imagefilltoborder() of GD library +Testing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error1.phpt b/ext/gd/tests/imagefilltoborder_error1.phpt index 6979a9b8cbb..c53d53718db 100644 --- a/ext/gd/tests/imagefilltoborder_error1.phpt +++ b/ext/gd/tests/imagefilltoborder_error1.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt index e7efac5e0af..c540000f564 100644 --- a/ext/gd/tests/imagefilltoborder_error2.phpt +++ b/ext/gd/tests/imagefilltoborder_error2.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt index e5caf07595c..3d80fcbfa24 100644 --- a/ext/gd/tests/imagefilltoborder_error3.phpt +++ b/ext/gd/tests/imagefilltoborder_error3.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt index 08806818a14..e0b34c8b134 100644 --- a/ext/gd/tests/imagefilltoborder_error4.phpt +++ b/ext/gd/tests/imagefilltoborder_error4.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt index c56d66207df..8822cab23a0 100644 --- a/ext/gd/tests/imagefilltoborder_error5.phpt +++ b/ext/gd/tests/imagefilltoborder_error5.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt index f1a7fb02bb4..03ac65be9cf 100644 --- a/ext/gd/tests/imagefilltoborder_error6.phpt +++ b/ext/gd/tests/imagefilltoborder_error6.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if (!extension_loaded("gd")) die("skip GD not present"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagefilltoborder_error7.phpt b/ext/gd/tests/imagefilltoborder_error7.phpt index e1b45a342ad..944fe8e4d4f 100644 --- a/ext/gd/tests/imagefilltoborder_error7.phpt +++ b/ext/gd/tests/imagefilltoborder_error7.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagefilltoborder() of GD library +Testing wrong param passing imagefilltoborder() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded("gd")) die("skip GD not present; skipping test"); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt index 84885c4260a..8a439075f24 100644 --- a/ext/gd/tests/imageflip.phpt +++ b/ext/gd/tests/imageflip.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing imageflip() of GD library +Testing imageflip() of GD library --SKIPIF-- <?php if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' ); diff --git a/ext/gd/tests/imagegammacorrect_error1.phpt b/ext/gd/tests/imagegammacorrect_error1.phpt index 2640495457d..ab60957579c 100644 --- a/ext/gd/tests/imagegammacorrect_error1.phpt +++ b/ext/gd/tests/imagegammacorrect_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing error with non-resource paramenter of imagegammacorrect() of GD library, +Testing error with non-resource paramenter of imagegammacorrect() of GD library, --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagegammacorrect_error2.phpt b/ext/gd/tests/imagegammacorrect_error2.phpt index 57c8a7503a7..fd6d136ae8e 100644 --- a/ext/gd/tests/imagegammacorrect_error2.phpt +++ b/ext/gd/tests/imagegammacorrect_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing error with non-Image resource paramenter of imagegammacorrect() of GD library, +Testing error with non-Image resource paramenter of imagegammacorrect() of GD library, --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagegammacorrect_error3.phpt b/ext/gd/tests/imagegammacorrect_error3.phpt index 5f9d7b22de6..8bb47ad2342 100644 --- a/ext/gd/tests/imagegammacorrect_error3.phpt +++ b/ext/gd/tests/imagegammacorrect_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing error with non-double first paramenter of imagegammacorrect() of GD library, +Testing error with non-double first paramenter of imagegammacorrect() of GD library, --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagegammacorrect_error4.phpt b/ext/gd/tests/imagegammacorrect_error4.phpt index e5f0bd73654..d2546fd41c5 100644 --- a/ext/gd/tests/imagegammacorrect_error4.phpt +++ b/ext/gd/tests/imagegammacorrect_error4.phpt @@ -1,5 +1,5 @@ --TEST-- -Testing error with non-double second paramenter of imagegammacorrect() of GD library, +Testing error with non-double second paramenter of imagegammacorrect() of GD library, --CREDITS-- Rafael Dohms <rdohms [at] gmail [dot] com> #testfest PHPSP on 2009-06-20 diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt index 19e54fa901f..21186e9ecc2 100644 --- a/ext/gd/tests/imagepolygon_basic.phpt +++ b/ext/gd/tests/imagepolygon_basic.phpt @@ -22,7 +22,7 @@ $dest = dirname(realpath(__FILE__)) . '/imagepolygon.png'; // create a blank image $image = imagecreatetruecolor(400, 300); -// set the background color to black +// set the background color to black $bg = imagecolorallocate($image, 0, 0, 0); // draw a red polygon diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt index 01544429f65..462ff583375 100644 --- a/ext/gd/tests/imagerectangle_basic.phpt +++ b/ext/gd/tests/imagerectangle_basic.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing imagerectangle() of GD library +Testing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error1.phpt b/ext/gd/tests/imagerectangle_error1.phpt index 4e8c1b4d1de..1dd04dab493 100644 --- a/ext/gd/tests/imagerectangle_error1.phpt +++ b/ext/gd/tests/imagerectangle_error1.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt index 4f20dd81bbd..dd84ff414ad 100644 --- a/ext/gd/tests/imagerectangle_error2.phpt +++ b/ext/gd/tests/imagerectangle_error2.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a resource +// Create a resource $image = tmpfile(); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt index dfcc66c69e6..1b31d1c9506 100644 --- a/ext/gd/tests/imagerectangle_error3.phpt +++ b/ext/gd/tests/imagerectangle_error3.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt index 8ee437dd334..e158360ffe8 100644 --- a/ext/gd/tests/imagerectangle_error4.phpt +++ b/ext/gd/tests/imagerectangle_error4.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt index 9ccca07ae76..5cbdcbf2c7c 100644 --- a/ext/gd/tests/imagerectangle_error5.phpt +++ b/ext/gd/tests/imagerectangle_error5.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt index 0b35ec8f718..ee09496b47b 100644 --- a/ext/gd/tests/imagerectangle_error6.phpt +++ b/ext/gd/tests/imagerectangle_error6.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt index e1187ee2d6f..d8638491953 100644 --- a/ext/gd/tests/imagerectangle_error7.phpt +++ b/ext/gd/tests/imagerectangle_error7.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gd/tests/imagerectangle_error8.phpt b/ext/gd/tests/imagerectangle_error8.phpt index 63e293c2170..47b4a021760 100644 --- a/ext/gd/tests/imagerectangle_error8.phpt +++ b/ext/gd/tests/imagerectangle_error8.phpt @@ -1,7 +1,7 @@ --TEST-- -Testing wrong param passing imagerectangle() of GD library +Testing wrong param passing imagerectangle() of GD library --CREDITS-- -Ivan Rosolen <contato [at] ivanrosolen [dot] com> +Ivan Rosolen <contato [at] ivanrosolen [dot] com> #testfest PHPSP on 2009-06-30 --SKIPIF-- <?php @@ -9,7 +9,7 @@ if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); ?> --FILE-- <?php -// Create a image +// Create a image $image = imagecreatetruecolor( 100, 100 ); // Draw a rectangle diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt index 66be43289a4..15107fe0f97 100644 --- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt +++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt @@ -1,5 +1,5 @@ --TEST-- -test if bind_textdomain_codeset() returns correct value +test if bind_textdomain_codeset() returns correct value --SKIPIF-- <?php if (!extension_loaded("gettext")) { diff --git a/ext/gettext/tests/gettext_phpinfo.phpt b/ext/gettext/tests/gettext_phpinfo.phpt index cbfb916c2d8..a2bc332ea2a 100644 --- a/ext/gettext/tests/gettext_phpinfo.phpt +++ b/ext/gettext/tests/gettext_phpinfo.phpt @@ -1,5 +1,5 @@ --TEST-- -Test phpinfo() displays gettext support +Test phpinfo() displays gettext support --SKIPIF-- <?php if (!extension_loaded("gettext")) { diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt index 5c9bbd8aa2e..e760819e69a 100644 --- a/ext/hash/tests/hash_error.phpt +++ b/ext/hash/tests/hash_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash() function : error conditions +Hash: hash() function : error conditions --FILE-- <?php diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt index f196211b179..283cc375272 100644 --- a/ext/hash/tests/hash_file_basic.phpt +++ b/ext/hash/tests/hash_file_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_file() function : basic functionality +Hash: hash_file() function : basic functionality --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt index 05c23c02f87..3984fbcb210 100644 --- a/ext/hash/tests/hash_file_basic1.phpt +++ b/ext/hash/tests/hash_file_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_file() function : basic functionality +Hash: hash_file() function : basic functionality --FILE-- <?php @@ -27,7 +27,7 @@ if (is_writable($file)) { } } -// close the file +// close the file fclose($fp); echo "adler32: " . hash_file('adler32', $file) . "\n"; diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt index b7ef23a2ba7..a634070de5b 100644 --- a/ext/hash/tests/hash_file_error.phpt +++ b/ext/hash/tests/hash_file_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_file() function : error conditions +Hash: hash_file() function : error conditions --CREDITS-- Felix De Vliegher <felix.devliegher@gmail.com> --FILE-- diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt index 481aad792f2..76efff48b39 100644 --- a/ext/hash/tests/hash_hmac_algos.phpt +++ b/ext/hash/tests/hash_hmac_algos.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_hmac_algos() function : basic functionality +Hash: hash_hmac_algos() function : basic functionality --FILE-- <?php diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt index 755c1441ceb..1ad27e1cb21 100644 --- a/ext/hash/tests/hash_hmac_basic.phpt +++ b/ext/hash/tests/hash_hmac_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_file() function : basic functionality +Hash: hash_file() function : basic functionality --FILE-- <?php diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt index e03527f442c..89d29b8df8b 100644 --- a/ext/hash/tests/hash_hmac_error.phpt +++ b/ext/hash/tests/hash_hmac_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_hmac() function : basic functionality +Hash: hash_hmac() function : basic functionality --FILE-- <?php /* diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt index 7cd9460f320..91358250082 100644 --- a/ext/hash/tests/hash_hmac_file_basic.phpt +++ b/ext/hash/tests/hash_hmac_file_basic.phpt @@ -28,7 +28,7 @@ if (is_writable($file)) { } } -// close the files +// close the files fclose($fp); $key = 'secret'; diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt index 6d383b479d4..5b82c288ec1 100644 --- a/ext/hash/tests/hash_hmac_file_error.phpt +++ b/ext/hash/tests/hash_hmac_file_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Hash: hash_hmac_file() function : basic functionality +Hash: hash_hmac_file() function : basic functionality --FILE-- <?php diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt index 4ffcfef5165..38cfdd37b89 100644 --- a/ext/iconv/tests/eucjp2utf8.phpt +++ b/ext/iconv/tests/eucjp2utf8.phpt @@ -48,7 +48,7 @@ $str = " ܸƥȤEnglish Text "; -$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ +$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ $str = base64_encode($str); echo $str."\n"; diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt index 8669af040c2..1c57cfbeff5 100644 --- a/ext/iconv/tests/iconv_basic.phpt +++ b/ext/iconv/tests/iconv_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test iconv() function : basic functionality +Test iconv() function : basic functionality --SKIPIF-- <?php extension_loaded('iconv') or die('skip'); @@ -8,7 +8,7 @@ function_exists('iconv') or die("skip iconv() is not available in this build"); --FILE-- <?php /* Prototype : string iconv(string in_charset, string out_charset, string str) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt index 6b0d4f11b48..e69e4175a8f 100644 --- a/ext/iconv/tests/iconv_encoding_basic.phpt +++ b/ext/iconv/tests/iconv_encoding_basic.phpt @@ -16,7 +16,7 @@ iconv.output_encoding=ISO-8859-1 * Description: Get internal encoding and output encoding for ob_iconv_handler() * Prototype : bool iconv_set_encoding(string type, string charset) * Description: Sets internal encoding and output encoding for ob_iconv_handler() - * Source code: ext/iconv/iconv.c + * Source code: ext/iconv/iconv.c */ /* diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt index d7126c482ed..0526fce2a56 100644 --- a/ext/iconv/tests/iconv_get_encoding_error.phpt +++ b/ext/iconv/tests/iconv_get_encoding_error.phpt @@ -9,7 +9,7 @@ function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not a <?php /* Prototype : mixed iconv_get_encoding([string type]) * Description: Get internal encoding and output encoding for ob_iconv_handler() - * Source code: ext/iconv/iconv.c + * Source code: ext/iconv/iconv.c */ /* diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt index 0fc84500654..4176bf9165c 100644 --- a/ext/iconv/tests/iconv_set_encoding_error.phpt +++ b/ext/iconv/tests/iconv_set_encoding_error.phpt @@ -9,7 +9,7 @@ function_exists('iconv_set_encoding') or die("skip iconv_set_encoding() is not a <?php /* Prototype : bool iconv_set_encoding(string type, string charset) * Description: Sets internal encoding and output encoding for ob_iconv_handler() - * Source code: ext/iconv/iconv.c + * Source code: ext/iconv/iconv.c */ /* diff --git a/ext/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt index a75e10b346a..906f46bc315 100644 --- a/ext/iconv/tests/iconv_set_encoding_variation.phpt +++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt @@ -11,7 +11,7 @@ error_reporting=E_ALL & ~E_DEPRECATED <?php /* Prototype : bool iconv_set_encoding(string type, string charset) * Description: Sets internal encoding and output encoding for ob_iconv_handler() - * Source code: ext/iconv/iconv.c + * Source code: ext/iconv/iconv.c */ /* diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt index f4f8d7fb9ba..7e1bec9e733 100644 --- a/ext/iconv/tests/iconv_strlen_basic.phpt +++ b/ext/iconv/tests/iconv_strlen_basic.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in --FILE-- <?php /* Prototype : int iconv_strlen(string str [, string charset]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strlen_error1.phpt b/ext/iconv/tests/iconv_strlen_error1.phpt index 3c63b20f798..21b99c011df 100644 --- a/ext/iconv/tests/iconv_strlen_error1.phpt +++ b/ext/iconv/tests/iconv_strlen_error1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in --FILE-- <?php /* Prototype : int iconv_strlen(string str [, string charset]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt index 6c760b14c8e..973efecb350 100644 --- a/ext/iconv/tests/iconv_strlen_error2.phpt +++ b/ext/iconv/tests/iconv_strlen_error2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in --FILE-- <?php /* Prototype : int iconv_strlen(string str [, string charset]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strlen_variation1.phpt b/ext/iconv/tests/iconv_strlen_variation1.phpt index 877963738d7..d6edf5b86d6 100644 --- a/ext/iconv/tests/iconv_strlen_variation1.phpt +++ b/ext/iconv/tests/iconv_strlen_variation1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in --FILE-- <?php /* Prototype : int iconv_strlen(string str [, string charset]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt index daa0cc46e3e..be5afdc93b2 100644 --- a/ext/iconv/tests/iconv_strlen_variation2.phpt +++ b/ext/iconv/tests/iconv_strlen_variation2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in --FILE-- <?php /* Prototype : int iconv_strlen(string str [, string charset]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt index 88f4903ca36..8aa3ce42a52 100644 --- a/ext/iconv/tests/iconv_strpos_basic.phpt +++ b/ext/iconv/tests/iconv_strpos_basic.phpt @@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_error1.phpt b/ext/iconv/tests/iconv_strpos_error1.phpt index 232466562c4..dd0fe466d76 100644 --- a/ext/iconv/tests/iconv_strpos_error1.phpt +++ b/ext/iconv/tests/iconv_strpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_error2.phpt b/ext/iconv/tests/iconv_strpos_error2.phpt index 01e728ad9e0..91f27049030 100644 --- a/ext/iconv/tests/iconv_strpos_error2.phpt +++ b/ext/iconv/tests/iconv_strpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt index e367a0ac7d2..1eb8f7b21b7 100644 --- a/ext/iconv/tests/iconv_strpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt index 308b723c965..798fe7f85cf 100644 --- a/ext/iconv/tests/iconv_strpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt index 7f5281b34f7..0a3b343bfca 100644 --- a/ext/iconv/tests/iconv_strpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt index 88f043086af..9389282f0a9 100644 --- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt +++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt index b992ad6e00f..5a97c2a5acb 100644 --- a/ext/iconv/tests/iconv_strpos_variation4.phpt +++ b/ext/iconv/tests/iconv_strpos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt index 759294f73a9..7ada6fbb91a 100644 --- a/ext/iconv/tests/iconv_strpos_variation5.phpt +++ b/ext/iconv/tests/iconv_strpos_variation5.phpt @@ -10,13 +10,13 @@ error_reporting=E_ALL & ~E_DEPRECATED --FILE-- <?php /* Prototype : int iconv_strpos(string haystack, string needle [, int offset [, string charset]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/iconv/iconv.c */ /* * Test how iconv_strpos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt index 5a6ee82d9f2..bf2a5d9efa8 100644 --- a/ext/iconv/tests/iconv_strrpos_basic.phpt +++ b/ext/iconv/tests/iconv_strrpos_basic.phpt @@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt index 9d185c744d8..b9a18209335 100644 --- a/ext/iconv/tests/iconv_strrpos_error1.phpt +++ b/ext/iconv/tests/iconv_strrpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt index ea72322807d..16b7a9def82 100644 --- a/ext/iconv/tests/iconv_strrpos_error2.phpt +++ b/ext/iconv/tests/iconv_strrpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt index 76377246522..573c2ea517f 100644 --- a/ext/iconv/tests/iconv_strrpos_variation1.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt index 5a669205c01..297a7589d38 100644 --- a/ext/iconv/tests/iconv_strrpos_variation2.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt index 1da6f82aa41..35e5056e0f3 100644 --- a/ext/iconv/tests/iconv_strrpos_variation3.phpt +++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt @@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i --FILE-- <?php /* Prototype : proto int iconv_strrpos(string haystack, string needle [, string charset]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt index 2e33c5aa9b3..582529d54d1 100644 --- a/ext/iconv/tests/iconv_substr_basic.phpt +++ b/ext/iconv/tests/iconv_substr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test iconv_substr() function : basic functionality +Test iconv_substr() function : basic functionality --SKIPIF-- <?php extension_loaded('iconv') or die('skip'); @@ -12,7 +12,7 @@ iconv.output_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : string iconv_substr(string str, int offset, [int length, string charset]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt index 7a30c7d5091..61c01dc0d09 100644 --- a/ext/iconv/tests/iconv_substr_error1.phpt +++ b/ext/iconv/tests/iconv_substr_error1.phpt @@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in --FILE-- <?php /* Prototype : string iconv_substr(string str, int offset, [int length, string charset]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt index ac5081331b2..0bc0661026d 100644 --- a/ext/iconv/tests/iconv_substr_error2.phpt +++ b/ext/iconv/tests/iconv_substr_error2.phpt @@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in --FILE-- <?php /* Prototype : string iconv_substr(string str, int offset, [int length, string charset]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/iconv/iconv.c */ diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt index d8b9fbff839..2132e7e130f 100644 --- a/ext/iconv/tests/translit-failure.phpt +++ b/ext/iconv/tests/translit-failure.phpt @@ -3,7 +3,7 @@ Translit failure --SKIPIF-- <?php include('skipif.inc'); -( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); +( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); ?> --INI-- error_reporting=2039 diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt index 0151dc385c3..c363eeeab69 100644 --- a/ext/iconv/tests/translit-utf8.phpt +++ b/ext/iconv/tests/translit-utf8.phpt @@ -3,7 +3,7 @@ Translit UTF-8 quotes --SKIPIF-- <?php include('skipif.inc'); -( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); +( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); ?> --INI-- error_reporting=2047 diff --git a/ext/imap/tests/imap_8bit_basic.phpt b/ext/imap/tests/imap_8bit_basic.phpt index aaa05917223..799889bb3d2 100644 --- a/ext/imap/tests/imap_8bit_basic.phpt +++ b/ext/imap/tests/imap_8bit_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_8bit() function : basic functionality +Test imap_8bit() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt index 33892c77eef..2baefc3da16 100644 --- a/ext/imap/tests/imap_alerts_error.phpt +++ b/ext/imap/tests/imap_alerts_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_alerts() function : error conditions +Test imap_alerts() function : error conditions --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_alerts(void) - * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. + * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. * Source code: ext/imap/php_imap.c * Alias to functions: */ diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt index e64812d004b..e46268533d1 100644 --- a/ext/imap/tests/imap_append_basic.phpt +++ b/ext/imap/tests/imap_append_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_append() function : basic functionality +Test imap_append() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt index c1f4bf09b34..3557e9f87ee 100644 --- a/ext/imap/tests/imap_base64_basic.phpt +++ b/ext/imap/tests/imap_base64_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_base64() function : basic functionality +Test imap_base64() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index 314776f3a37..04f85386bce 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_binary() function : basic functionality +Test imap_binary() function : basic functionality --SKIPIF-- <?php extension_loaded('imap') or die('skip imap extension not available in this build'); diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt index 40f35f07aa5..1c75a944267 100644 --- a/ext/imap/tests/imap_body.phpt +++ b/ext/imap/tests/imap_body.phpt @@ -16,7 +16,7 @@ echo "Checking with incorrect parameter type\n"; imap_body(''); imap_body(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_body($stream_id); imap_body($stream_id,-1); diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt index ba1d77764b5..3cfe3e3d6b6 100644 --- a/ext/imap/tests/imap_body_basic.phpt +++ b/ext/imap/tests/imap_body_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_body() function : basic functionality +Test imap_body() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt index 69e73280774..a5db378c008 100644 --- a/ext/imap/tests/imap_bodystruct_basic.phpt +++ b/ext/imap/tests/imap_bodystruct_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_bodystruct() function : basic functionality +Test imap_bodystruct() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt index 243cba98cde..359c3af28c4 100644 --- a/ext/imap/tests/imap_clearflag_full_basic.phpt +++ b/ext/imap/tests/imap_clearflag_full_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_clearflag_full() function : basic functionality +Test imap_clearflag_full() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); diff --git a/ext/imap/tests/imap_close_basic.phpt b/ext/imap/tests/imap_close_basic.phpt index a99853071b3..bbb78bfbf96 100644 --- a/ext/imap/tests/imap_close_basic.phpt +++ b/ext/imap/tests/imap_close_basic.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_error.phpt b/ext/imap/tests/imap_close_error.phpt index fd32f3edd8f..89cafab3bac 100644 --- a/ext/imap/tests/imap_close_error.phpt +++ b/ext/imap/tests/imap_close_error.phpt @@ -7,7 +7,7 @@ require_once (dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt index 8206e0ac1f4..eb649b0d5a6 100644 --- a/ext/imap/tests/imap_close_variation1.phpt +++ b/ext/imap/tests/imap_close_variation1.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt index 412a835a1a5..652c4260a00 100644 --- a/ext/imap/tests/imap_close_variation2.phpt +++ b/ext/imap/tests/imap_close_variation2.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation3.phpt b/ext/imap/tests/imap_close_variation3.phpt index 6f6161aa235..777ca07124c 100644 --- a/ext/imap/tests/imap_close_variation3.phpt +++ b/ext/imap/tests/imap_close_variation3.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt index ca82619d42c..7a2d59b9b16 100644 --- a/ext/imap/tests/imap_close_variation4.phpt +++ b/ext/imap/tests/imap_close_variation4.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_close(resource $stream_id [, int $options]) - * Description: Close an IMAP stream + * Description: Close an IMAP stream * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt index 81021103178..e827af5960e 100644 --- a/ext/imap/tests/imap_createmailbox_basic.phpt +++ b/ext/imap/tests/imap_createmailbox_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_createmailbox() function : basic functionality +Test imap_createmailbox() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -15,7 +15,7 @@ echo "*** Testing imap_createmailbox() : basic functionality ***\n"; require_once(dirname(__FILE__).'/imap_include.inc'); -$imap_stream = imap_open($default_mailbox, $username, $password) or +$imap_stream = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); $newname = "phpnewbox"; diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt index 2c007818604..e4c77213931 100644 --- a/ext/imap/tests/imap_errors_basic.phpt +++ b/ext/imap/tests/imap_errors_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_errors() function : basic functionality +Test imap_errors() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -13,7 +13,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); echo "*** Testing imap_errors() : basic functionality ***\n"; require_once(dirname(__FILE__).'/imap_include.inc'); -$password = "bogus"; // invalid password to use in this test +$password = "bogus"; // invalid password to use in this test echo "Issue open with invalid password with normal default number of retries, i.e 3\n"; $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3); diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt index 83fab123912..152eaae9da0 100644 --- a/ext/imap/tests/imap_fetch_overview_basic.phpt +++ b/ext/imap/tests/imap_fetch_overview_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_fetch_overview() function : basic functionality +Test imap_fetch_overview() function : basic functionality --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_error.phpt b/ext/imap/tests/imap_fetch_overview_error.phpt index e300e629280..78510d6bd15 100644 --- a/ext/imap/tests/imap_fetch_overview_error.phpt +++ b/ext/imap/tests/imap_fetch_overview_error.phpt @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt index 17ebe970346..a0508e6d0d5 100644 --- a/ext/imap/tests/imap_fetch_overview_variation1.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt @@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt index 33bcdb72ae1..4baa93ae060 100644 --- a/ext/imap/tests/imap_fetch_overview_variation2.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index 17778d1dda7..a73845d1d6a 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers of the given message sequence + * Description: Read an overview of the information in the headers of the given message sequence * Source code: ext/imap/php_imap.c */ @@ -30,11 +30,11 @@ $options = array ('1', true, 1.000000000000001, 0.00001e5, - PHP_INT_MAX, + PHP_INT_MAX, -PHP_INT_MAX ); -// iterate over each element of $options array +// iterate over each element of $options array $iterator = 1; imap_check($stream_id); foreach($options as $option) { diff --git a/ext/imap/tests/imap_fetch_overview_variation4.phpt b/ext/imap/tests/imap_fetch_overview_variation4.phpt index a5c26663107..4798344830b 100644 --- a/ext/imap/tests/imap_fetch_overview_variation4.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation4.phpt @@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt index 5feeedb523f..d713a33934f 100644 --- a/ext/imap/tests/imap_fetch_overview_variation5.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_fetch_overview() function : usage variations - $msg_no argument +Test imap_fetch_overview() function : usage variations - $msg_no argument --SKIPIF-- <?php require_once(dirname(__FILE__).'/skipif.inc'); @@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers - * of the given message sequence + * Description: Read an overview of the information in the headers + * of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt index 0c6ff4f6229..4c2d3234f79 100644 --- a/ext/imap/tests/imap_fetch_overview_variation6.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options]) - * Description: Read an overview of the information in the headers of the given message sequence + * Description: Read an overview of the information in the headers of the given message sequence * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt index 787e599a889..2986f0e89ec 100644 --- a/ext/imap/tests/imap_fetchbody_basic.phpt +++ b/ext/imap/tests/imap_fetchbody_basic.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_error.phpt b/ext/imap/tests/imap_fetchbody_error.phpt index f496fbd7691..a91599a3050 100644 --- a/ext/imap/tests/imap_fetchbody_error.phpt +++ b/ext/imap/tests/imap_fetchbody_error.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype :string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype :string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt index a522cb1b8df..03bbfc782c0 100644 --- a/ext/imap/tests/imap_fetchbody_variation1.phpt +++ b/ext/imap/tests/imap_fetchbody_variation1.phpt @@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt index 85ac2836150..342c9cc5e6b 100644 --- a/ext/imap/tests/imap_fetchbody_variation2.phpt +++ b/ext/imap/tests/imap_fetchbody_variation2.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt index 14b165f8ff2..560f2b82424 100644 --- a/ext/imap/tests/imap_fetchbody_variation3.phpt +++ b/ext/imap/tests/imap_fetchbody_variation3.phpt @@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt index d34a79c57ef..de336e4d50c 100644 --- a/ext/imap/tests/imap_fetchbody_variation4.phpt +++ b/ext/imap/tests/imap_fetchbody_variation4.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation5.phpt b/ext/imap/tests/imap_fetchbody_variation5.phpt index dfc5e9fa55c..50589e4d0b8 100644 --- a/ext/imap/tests/imap_fetchbody_variation5.phpt +++ b/ext/imap/tests/imap_fetchbody_variation5.phpt @@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build ?> --FILE-- <?php -/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section +/* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section * [, int options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt index 96f754b625c..ba3f7889354 100644 --- a/ext/imap/tests/imap_fetchbody_variation6.phpt +++ b/ext/imap/tests/imap_fetchbody_variation6.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options]) - * Description: Get a specific body section + * Description: Get a specific body section * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt index 5502c55fc47..70bb66b2bd2 100644 --- a/ext/imap/tests/imap_fetchheader_basic.phpt +++ b/ext/imap/tests/imap_fetchheader_basic.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ @@ -17,7 +17,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); // Initialise all required variables $stream_id = setup_test_mailbox('', 1, $mailbox, 'multiPart'); // setup temp mailbox with 1 msg $msg_no = 1; -$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, +$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, 'FT_PREFETCHTEXT' => FT_PREFETCHTEXT); // Calling imap_fetchheader() with all possible arguments diff --git a/ext/imap/tests/imap_fetchheader_error.phpt b/ext/imap/tests/imap_fetchheader_error.phpt index e2f5b1260bc..77f6002eb5e 100644 --- a/ext/imap/tests/imap_fetchheader_error.phpt +++ b/ext/imap/tests/imap_fetchheader_error.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt index 2df6aed40fc..ff828832f66 100644 --- a/ext/imap/tests/imap_fetchheader_variation1.phpt +++ b/ext/imap/tests/imap_fetchheader_variation1.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt index 0542bfb4bbc..cba0d9061a3 100644 --- a/ext/imap/tests/imap_fetchheader_variation2.phpt +++ b/ext/imap/tests/imap_fetchheader_variation2.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index a965a652c54..728f8c38999 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt index b4b19e3d378..ad45f4d39da 100644 --- a/ext/imap/tests/imap_fetchheader_variation4.phpt +++ b/ext/imap/tests/imap_fetchheader_variation4.phpt @@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt index d88edfd0396..bdd6f6de606 100644 --- a/ext/imap/tests/imap_fetchheader_variation5.phpt +++ b/ext/imap/tests/imap_fetchheader_variation5.phpt @@ -7,12 +7,12 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options]) - * Description: Get the full unfiltered header for a message + * Description: Get the full unfiltered header for a message * Source code: ext/imap/php_imap.c */ /* - * Pass different integers and strings as $msg_no argument + * Pass different integers and strings as $msg_no argument * to test behaviour of imap_fetchheader() */ diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt index 51dc9d58dd5..7bfd95b8c01 100644 --- a/ext/imap/tests/imap_gc_error.phpt +++ b/ext/imap/tests/imap_gc_error.phpt @@ -17,7 +17,7 @@ imap_gc('', false); imap_gc(false, false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_gc($stream_id, -1); diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt index 05cbcaf5584..63617686b1d 100644 --- a/ext/imap/tests/imap_getsubscribed_basic.phpt +++ b/ext/imap/tests/imap_getsubscribed_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_getsubscribed() function : basic functionality +imap_getsubscribed() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_getsubscribed(''); imap_getsubscribed(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_getsubscribed($stream_id); diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt index 0f245a4b1ed..afee066f4a3 100644 --- a/ext/imap/tests/imap_headerinfo_basic.phpt +++ b/ext/imap/tests/imap_headerinfo_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_headerinfo() function : basic functionality +imap_headerinfo() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_headerinfo_error.phpt b/ext/imap/tests/imap_headerinfo_error.phpt index cf9340b92e9..9869c3472e2 100644 --- a/ext/imap/tests/imap_headerinfo_error.phpt +++ b/ext/imap/tests/imap_headerinfo_error.phpt @@ -16,7 +16,7 @@ imap_headerinfo(''); imap_headerinfo(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_headerinfo($stream_id); diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt index 36f07f755aa..436cd5c3a34 100644 --- a/ext/imap/tests/imap_list_basic.phpt +++ b/ext/imap/tests/imap_list_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_list() function : basic functionality +imap_list() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_list(''); imap_list(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_list($stream_id); diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt index d0f3b045923..7775ec0c3ee 100644 --- a/ext/imap/tests/imap_lsub_basic.phpt +++ b/ext/imap/tests/imap_lsub_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_lsub() function : basic functionality +imap_lsub() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -16,7 +16,7 @@ imap_lsub(''); imap_lsub(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_lsub($stream_id); diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt index a1bac4f0b9f..fc6d7e56a27 100644 --- a/ext/imap/tests/imap_mail_copy.phpt +++ b/ext/imap/tests/imap_mail_copy.phpt @@ -22,7 +22,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); var_dump(imap_mail_copy($stream_id)); diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt index be463161b48..05cb128a61e 100644 --- a/ext/imap/tests/imap_mail_copy_basic.phpt +++ b/ext/imap/tests/imap_mail_copy_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_mail_copy() function : basic functionality +Test imap_mail_copy() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_mail_copy ( resource $imap_stream , string $msglist , string $mailbox [, int $options = 0 ] ) - * Description: Copies mail messages specified by msglist to specified mailbox. + * Description: Copies mail messages specified by msglist to specified mailbox. * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt index bca8cba003a..0456e23c087 100644 --- a/ext/imap/tests/imap_mail_move.phpt +++ b/ext/imap/tests/imap_mail_move.phpt @@ -22,7 +22,7 @@ require_once(dirname(__FILE__).'/imap_include.inc'); echo "Test with IMAP server\n"; -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); var_dump(imap_mail_move($stream_id)); diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt index 9cc041b56f7..bd04308a440 100644 --- a/ext/imap/tests/imap_mail_move_basic.phpt +++ b/ext/imap/tests/imap_mail_move_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test imap_mail_move() function : basic functionality +Test imap_mail_move() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- @@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc'); --FILE-- <?php /* Prototype : bool imap_mail_move ( resource $imap_stream , string $msglist , string $mailbox [, int $options = 0 ] ) - * Description: Copies mail messages specified by msglist to specified mailbox. + * Description: Copies mail messages specified by msglist to specified mailbox. * Source code: ext/imap/php_imap.c */ diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt index 49d45ae71f7..d8b3f485e59 100644 --- a/ext/imap/tests/imap_renamemailbox_basic.phpt +++ b/ext/imap/tests/imap_renamemailbox_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_renamemailbox() function : basic functionality +imap_renamemailbox() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt index dabe7ce6edd..07eb69bf685 100644 --- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt +++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_rfc822_parse_headers() function : basic functionality +imap_rfc822_parse_headers() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt index 774a246447d..23c35739963 100644 --- a/ext/imap/tests/imap_savebody_basic.phpt +++ b/ext/imap/tests/imap_savebody_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_savebody() function : basic functionality +imap_savebody() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt index 181f042531a..92c43bded73 100644 --- a/ext/imap/tests/imap_timeout_basic.phpt +++ b/ext/imap/tests/imap_timeout_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_timeout() function : basic functionality +imap_timeout() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt index c843a574409..60e30ae21bb 100644 --- a/ext/imap/tests/imap_undelete_basic.phpt +++ b/ext/imap/tests/imap_undelete_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -imap_undelete() function : basic functionality +imap_undelete() function : basic functionality --CREDITS-- Olivier Doucet --SKIPIF-- diff --git a/ext/imap/tests/imap_undelete_error.phpt b/ext/imap/tests/imap_undelete_error.phpt index 4a19c71ad0f..3366c04f051 100644 --- a/ext/imap/tests/imap_undelete_error.phpt +++ b/ext/imap/tests/imap_undelete_error.phpt @@ -16,7 +16,7 @@ imap_undelete(''); imap_undelete(false); require_once(dirname(__FILE__).'/imap_include.inc'); -$stream_id = imap_open($default_mailbox, $username, $password) or +$stream_id = imap_open($default_mailbox, $username, $password) or die("Cannot connect to mailbox $default_mailbox: " . imap_last_error()); imap_undelete($stream_id); diff --git a/ext/interbase/tests/ibase_drop_db_001.phpt b/ext/interbase/tests/ibase_drop_db_001.phpt index 31db4034ba4..5aabb8bffe9 100644 --- a/ext/interbase/tests/ibase_drop_db_001.phpt +++ b/ext/interbase/tests/ibase_drop_db_001.phpt @@ -10,7 +10,7 @@ require("interbase.inc"); unlink($file = tempnam('/tmp',"php_ibase_test")); -$db = ibase_query(IBASE_CREATE, +$db = ibase_query(IBASE_CREATE, sprintf("CREATE SCHEMA '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",$file, $user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE')); diff --git a/ext/intl/tests/calendar_getXMaximum_basic.phpt b/ext/intl/tests/calendar_getXMaximum_basic.phpt index 9b840212d92..2e6d1a3fa92 100644 --- a/ext/intl/tests/calendar_getXMaximum_basic.phpt +++ b/ext/intl/tests/calendar_getXMaximum_basic.phpt @@ -17,7 +17,7 @@ var_dump( $intlcal->getLeastMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_least_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getActualMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), - intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), + intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getMaximum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH) ); diff --git a/ext/intl/tests/calendar_getXMinimum_basic.phpt b/ext/intl/tests/calendar_getXMinimum_basic.phpt index 83fd1638098..ff0518d8822 100644 --- a/ext/intl/tests/calendar_getXMinimum_basic.phpt +++ b/ext/intl/tests/calendar_getXMinimum_basic.phpt @@ -17,7 +17,7 @@ var_dump( $intlcal->getGreatestMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_greatest_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getActualMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), - intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), + intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), $intlcal->getMinimum(IntlCalendar::FIELD_DAY_OF_MONTH), intlcal_get_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH) ); diff --git a/ext/intl/tests/collator_create4.phpt b/ext/intl/tests/collator_create4.phpt index 0e2126eca4e..509a89913bc 100644 --- a/ext/intl/tests/collator_create4.phpt +++ b/ext/intl/tests/collator_create4.phpt @@ -1,5 +1,5 @@ --TEST-- -create() icu >= 53.1 +create() icu >= 53.1 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?> diff --git a/ext/intl/tests/idn_uts46_basic.phpt b/ext/intl/tests/idn_uts46_basic.phpt index 4cf349081bb..881e8311c9d 100644 --- a/ext/intl/tests/idn_uts46_basic.phpt +++ b/ext/intl/tests/idn_uts46_basic.phpt @@ -12,7 +12,7 @@ $utf8dn = "www.fußball.com"; $asciiNonTrans = "www.xn--fuball-cta.com"; echo "all ok, no details:", "\n"; -var_dump(idn_to_ascii($utf8dn, +var_dump(idn_to_ascii($utf8dn, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46)); echo "all ok, no details, transitional:", "\n"; diff --git a/ext/intl/tests/locale_accept.phpt b/ext/intl/tests/locale_accept.phpt index cf1dc6e675c..a2834d8adec 100644 --- a/ext/intl/tests/locale_accept.phpt +++ b/ext/intl/tests/locale_accept.phpt @@ -6,7 +6,7 @@ locale_accept_from_http <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_compose_locale.phpt b/ext/intl/tests/locale_compose_locale.phpt index 85b7257708c..5eef05b3e63 100644 --- a/ext/intl/tests/locale_compose_locale.phpt +++ b/ext/intl/tests/locale_compose_locale.phpt @@ -6,7 +6,7 @@ locale_compose_locale() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ @@ -15,7 +15,7 @@ function ut_main() $loc_parts_arr1 = array( Locale::LANG_TAG =>'sl' , Locale::SCRIPT_TAG =>'Latn' , - Locale::REGION_TAG =>'IT' + Locale::REGION_TAG =>'IT' ); $loc_parts_arr2 = array( Locale::LANG_TAG =>'de' , @@ -39,7 +39,7 @@ function ut_main() Locale::SCRIPT_TAG =>'Hans' , Locale::REGION_TAG =>'CN', Locale::VARIANT_TAG.'14' =>'rozaj' , - 'variant1'=>'nedis' + 'variant1'=>'nedis' ); $loc_parts_arr7 = array( Locale::LANG_TAG =>'en' , @@ -70,7 +70,7 @@ function ut_main() Locale::SCRIPT_TAG => 15 ); $loc_parts_arr11 = array( - Locale::LANG_TAG =>'de' , + Locale::LANG_TAG =>'de' , Locale::REGION_TAG =>'DE', 'private0' => 13, 'variant1' => array(), @@ -91,7 +91,7 @@ function ut_main() 'loc2' => $loc_parts_arr2 , 'loc3' => $loc_parts_arr3 , 'loc4' => $loc_parts_arr4 , - 'loc5' => $loc_parts_arr5 , + 'loc5' => $loc_parts_arr5 , 'loc6' => $loc_parts_arr6 , 'loc7' => $loc_parts_arr7 , 'loc8' => $loc_parts_arr8 , diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt index 156415576e5..e75079deb3e 100644 --- a/ext/intl/tests/locale_filter_matches2.phpt +++ b/ext/intl/tests/locale_filter_matches2.phpt @@ -7,7 +7,7 @@ locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_filter_matches3.phpt b/ext/intl/tests/locale_filter_matches3.phpt index 2d27de93469..2816ba5e122 100644 --- a/ext/intl/tests/locale_filter_matches3.phpt +++ b/ext/intl/tests/locale_filter_matches3.phpt @@ -1,5 +1,5 @@ --TEST-- -locale_filter_matches.phpt() ICU >= 51.2 +locale_filter_matches.phpt() ICU >= 51.2 --SKIPIF-- <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?> @@ -7,7 +7,7 @@ locale_filter_matches.phpt() ICU >= 51.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_get_all_variants.phpt b/ext/intl/tests/locale_get_all_variants.phpt index 09362e13ddf..8f2bcbfa396 100644 --- a/ext/intl/tests/locale_get_all_variants.phpt +++ b/ext/intl/tests/locale_get_all_variants.phpt @@ -6,7 +6,7 @@ locale_get_all_variants.phpt() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_get_keywords2.phpt b/ext/intl/tests/locale_get_keywords2.phpt index 20473beae36..23a099b4ede 100644 --- a/ext/intl/tests/locale_get_keywords2.phpt +++ b/ext/intl/tests/locale_get_keywords2.phpt @@ -29,7 +29,7 @@ function ut_main() 'fr', 'ja', 'i-enochian', //(example of a grandfathered tag) -//Language subtag plus Script subtag: +//Language subtag plus Script subtag: 'zh-Hant', 'zh-Hans', 'sr-Cyrl', @@ -52,7 +52,7 @@ function ut_main() //Private use subtags: 'de-CH-x-phonebk', 'az-Arab-x-AZE-derbend', -//Extended language subtags +//Extended language subtags 'zh-min', 'zh-min-nan-Hant-CN', //Private use registry values diff --git a/ext/intl/tests/locale_lookup.phpt b/ext/intl/tests/locale_lookup.phpt index 1d52e8049ff..9d4843038de 100644 --- a/ext/intl/tests/locale_lookup.phpt +++ b/ext/intl/tests/locale_lookup.phpt @@ -7,7 +7,7 @@ locale_lookup.phpt() icu >= 4.8 && icu < 50.1.2 <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_lookup_variant2.phpt b/ext/intl/tests/locale_lookup_variant2.phpt index c25e6142057..75a5350abfb 100644 --- a/ext/intl/tests/locale_lookup_variant2.phpt +++ b/ext/intl/tests/locale_lookup_variant2.phpt @@ -7,7 +7,7 @@ locale_lookup.phpt() <?php /* - * Try parsing different Locales + * Try parsing different Locales * with Procedural and Object methods. */ diff --git a/ext/intl/tests/locale_set_default.phpt b/ext/intl/tests/locale_set_default.phpt index 7debf4d3dea..d56c9177cde 100644 --- a/ext/intl/tests/locale_set_default.phpt +++ b/ext/intl/tests/locale_set_default.phpt @@ -56,7 +56,7 @@ function ut_main() 'sr-Latn-QM', 'sr-Qaaa-CS', //Tags that use extensions (examples ONLY: extensions MUST be defined -// by revision or update to this document or by RFC): +// by revision or update to this document or by RFC): 'en-US-u-islamCal', 'zh-CN-a-myExt-x-private', 'en-a-myExt-b-another', @@ -67,7 +67,7 @@ function ut_main() ); /* - $locales = array( + $locales = array( 'es' ); */ diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt index 8070677bf3e..70a2bce9125 100644 --- a/ext/intl/tests/normalizer_normalize.phpt +++ b/ext/intl/tests/normalizer_normalize.phpt @@ -80,8 +80,8 @@ function ut_main() $str_hex = urlencode($str); $str_norm_hex = urlencode($str_norm); - $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" - . "\terror info: '$error_message' ($error_code)\n" + $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" + . "\terror info: '$error_message' ($error_code)\n" . ""; $is_norm = ut_norm_is_normalized( $str, $form ); diff --git a/ext/intl/tests/normalizer_normalize_kc_cf.phpt b/ext/intl/tests/normalizer_normalize_kc_cf.phpt index 43b8afbfb50..246e41baa20 100644 --- a/ext/intl/tests/normalizer_normalize_kc_cf.phpt +++ b/ext/intl/tests/normalizer_normalize_kc_cf.phpt @@ -69,8 +69,8 @@ function ut_main() $str_hex = urlencode($str); $str_norm_hex = urlencode($str_norm); - $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" - . "\terror info: '$error_message' ($error_code)\n" + $res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" + . "\terror info: '$error_message' ($error_code)\n" . ""; $is_norm = ut_norm_is_normalized( $str, $form ); diff --git a/ext/intl/tests/symfony_format_type_int32_intl1.phpt b/ext/intl/tests/symfony_format_type_int32_intl1.phpt index 2867b35690b..7d892cf5b6e 100644 --- a/ext/intl/tests/symfony_format_type_int32_intl1.phpt +++ b/ext/intl/tests/symfony_format_type_int32_intl1.phpt @@ -10,13 +10,13 @@ Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #1 // Crashes on Windows // Windows note: the popup '...program has stopped working'(AEDebug Popup) -// doesn't always show if you're rapidly running this test repeatedly. +// doesn't always show if you're rapidly running this test repeatedly. // regardless of that, the test always crashes every time. // (it will show up the first time, or if you wait a while before running it again.) // (the popup may also be disabled, which can be done with a registry setting.) // you can confirm it crashed by checking the exit code OR // the message this test prints at the very end (expected output for pass). -// +// // Get Exit Code // Linux: echo $? // Windows: echo %ErrorLevel% diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt index b2dd0481860..9cf7cacdb9e 100644 --- a/ext/mbstring/tests/bug43840.phpt +++ b/ext/mbstring/tests/bug43840.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt index c4be058ffa7..753842cac4c 100644 --- a/ext/mbstring/tests/bug43841.phpt +++ b/ext/mbstring/tests/bug43841.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt index 2e8631d8deb..e9a11d054e3 100644 --- a/ext/mbstring/tests/bug43994.phpt +++ b/ext/mbstring/tests/bug43994.phpt @@ -8,12 +8,12 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ /* - * mb_ereg 'successfully' matching incorrectly: + * mb_ereg 'successfully' matching incorrectly: * Bug now seems to be fixed - error message is now generated when an 'empty' * pattern is supplied to mb_ereg. Similar error message to ereg(). */ diff --git a/ext/mbstring/tests/bug46806.phpt b/ext/mbstring/tests/bug46806.phpt index eec44b5232f..ea00035c0f9 100644 --- a/ext/mbstring/tests/bug46806.phpt +++ b/ext/mbstring/tests/bug46806.phpt @@ -3,7 +3,7 @@ Bug #46806 (mb_wtrimwidth cutting to early) --CREDITS-- Sebastian Schürmann sebs@php.net -Testfest 2009 +Testfest 2009 --SKIPIF-- <?php if (!extension_loaded("mbstring")) die("skip mbstring is not available"); ?> --FILE-- diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt index 03a090ded2d..002c5ed1744 100644 --- a/ext/mbstring/tests/bug65045.phpt +++ b/ext/mbstring/tests/bug65045.phpt @@ -17,7 +17,7 @@ $expected2 = "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2"."\xEF\xBF\xBD"; mb_substitute_character(0xFFFD); var_dump( $expected === htmlspecialchars_decode(htmlspecialchars($str, ENT_SUBSTITUTE, 'UTF-8')), - $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), + $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), $expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'), $expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8') ); diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt index 977b0bb658a..002269b680a 100644 --- a/ext/mbstring/tests/casefold.phpt +++ b/ext/mbstring/tests/casefold.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_strtoupper() / mb_strtolower() +mb_strtoupper() / mb_strtolower() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt index 21d827efd4f..943e0751a70 100644 --- a/ext/mbstring/tests/htmlent.phpt +++ b/ext/mbstring/tests/htmlent.phpt @@ -20,7 +20,7 @@ filter.default=unsafe_raw <?php // enable output encoding through output handler //ob_start("mb_output_handler"); -// @... are must be decoded on input these are not reencoded on output. +// @... are must be decoded on input these are not reencoded on output. // If you see @AB on output this means input encoding fails. // If you do not see ä... on output this means output encoding fails. // Using UTF-8 internally allows to encode/decode ALL characters. diff --git a/ext/mbstring/tests/illformed_utf_sequences.phpt b/ext/mbstring/tests/illformed_utf_sequences.phpt index 378b956d681..11ab1799e9c 100644 --- a/ext/mbstring/tests/illformed_utf_sequences.phpt +++ b/ext/mbstring/tests/illformed_utf_sequences.phpt @@ -128,7 +128,7 @@ echo "UTF-32 and surrogates area with BOM\n"; $out = ''; $cnt = 0; for ($i = 0xd7ff; $i <= 0xe000; ++$i) { - $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), + $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 1, "UTF-32", true); if ($s === false) { $cnt++; @@ -142,7 +142,7 @@ var_dump(str_replace("0000feff","",$out)); $out = ''; $cnt = 0; for ($i = 0xd7ff; $i <= 0xe000; ++$i) { - $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), + $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), 1, "UTF-32", true); if ($s === false) { $cnt++; diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt index 1bc7c8673a6..13faa9d12db 100644 --- a/ext/mbstring/tests/mb_convert_encoding.phpt +++ b/ext/mbstring/tests/mb_convert_encoding.phpt @@ -39,7 +39,7 @@ $s = mb_convert_encoding($s, 'JIS', 'EUC-JP'); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Encoding List Array +// Using Encoding List Array echo "== STRING ENCODING LIST ==\n"; $a = 'JIS,UTF-8,EUC-JP,SJIS'; @@ -56,7 +56,7 @@ $s = mb_convert_encoding($s, 'JIS', $a); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Encoding List Array +// Using Encoding List Array echo "== ARRAY ENCODING LIST ==\n"; $a = array(0=>'JIS', 1=>'UTF-8', 2=>'EUC-JP', 3=>'SJIS'); @@ -73,7 +73,7 @@ $s = mb_convert_encoding($s, 'JIS', $a); print("JIS: ".base64_encode($s)."\n"); // JIS -// Using Detect Order +// Using Detect Order echo "== DETECT ORDER ==\n"; $s = $jis; diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt index b41c717873c..bd413c46864 100644 --- a/ext/mbstring/tests/mb_convert_encoding_array.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt index 19626795eb9..31681260004 100644 --- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_convert_encoding() function : basic functionality +Test mb_convert_encoding() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt index d8969c2e1f0..50e7076a13c 100644 --- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not --FILE-- <?php /* Prototype : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding]) - * Description: Returns converted string in desired encoding + * Description: Returns converted string in desired encoding * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt index 22253b5352c..bc1c320c3db 100644 --- a/ext/mbstring/tests/mb_convert_variables.phpt +++ b/ext/mbstring/tests/mb_convert_variables.phpt @@ -70,32 +70,32 @@ print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP // Test for object echo "== OBJECT TEST ==\n"; -class foo +class foo { public $s1; public $s2; public $s3; - function __construct() + function __construct() { global $sjis, $jis, $euc_jp; - + $this->s1 = $euc_jp; $this->s2 = $euc_jp; $this->s3 = $euc_jp; } } -class bar +class bar { public $s1; public $s2; public $s3; - function __construct() + function __construct() { global $sjis, $jis, $euc_jp; - + $this->s1 = $euc_jp; $this->s2 = $euc_jp; $this->s3 = $euc_jp; diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt index 923ca64cf9d..39bea621fe5 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : basic functionality +Test mb_decode_mimeheader() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -16,7 +16,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n"; mb_internal_encoding('utf-8'); -//the following encoded-words are identical and are UTF-8 Japanese. +//the following encoded-words are identical and are UTF-8 Japanese. $a = "=?UTF-8?b?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?="; $b = mb_decode_mimeheader($a); var_dump(bin2hex($b)); diff --git a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt index e534d5942a5..3ceff967f59 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : error conditions +Test mb_decode_mimeheader() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt index b4e4d1e8433..5ee6fc569c9 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : usage variation +Test mb_decode_mimeheader() function : usage variation --CREDITS-- D. Kesley --SKIPIF-- @@ -10,7 +10,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -103,7 +103,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for string diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt index ca5b6d7b69b..33c022b0871 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : variation +Test mb_decode_mimeheader() function : variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt index dded058d119..6f5c8b9c534 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_decode_mimeheader() function : variation +Test mb_decode_mimeheader() function : variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n --FILE-- <?php /* Prototype : string mb_decode_mimeheader(string string) - * Description: Decodes the MIME "encoded-word" in the string + * Description: Decodes the MIME "encoded-word" in the string * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt index 4fd22a69c3b..d50330849c3 100644 --- a/ext/mbstring/tests/mb_detect_encoding.phpt +++ b/ext/mbstring/tests/mb_detect_encoding.phpt @@ -23,7 +23,7 @@ $euc_jp = ' echo "== BASIC TEST ==\n"; $s = $sjis; $s = mb_detect_encoding($s, 'SJIS'); -print("SJIS: $s\n"); +print("SJIS: $s\n"); $s = $jis; $s = mb_detect_encoding($s, 'JIS'); @@ -39,7 +39,7 @@ print("EUC-JP: $s\n"); -// Using Encoding List Array +// Using Encoding List Array echo "== ARRAY ENCODING LIST ==\n"; $a = array(0=>'UTF-8',1=>'EUC-JP', 2=>'SJIS', 3=>'JIS'); @@ -55,10 +55,10 @@ print("EUC-JP: $s\n"); $s = $sjis; $s = mb_detect_encoding($s, $a); -print("SJIS: $s\n"); +print("SJIS: $s\n"); -// Using Detect Order +// Using Detect Order echo "== DETECT ORDER ==\n"; mb_detect_order('auto'); @@ -66,15 +66,15 @@ mb_detect_order('auto'); $s = $jis; $s = mb_detect_encoding($s); -print("JIS: $s\n"); +print("JIS: $s\n"); $s = $euc_jp; $s = mb_detect_encoding($s); -print("EUC-JP: $s\n"); +print("EUC-JP: $s\n"); $s = $sjis; $s = mb_detect_encoding($s); -print("SJIS: $s\n"); +print("SJIS: $s\n"); // Invalid(?) Parameters diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt index 4aa1323adb0..3c98cba81ff 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt @@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt index 3e05b776110..c765785db92 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt @@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n --FILE-- <?php -/* Prototype : string mb_encode_mimeheader(string $str [, string $charset +/* Prototype : string mb_encode_mimeheader(string $str [, string $charset * [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt index f43717327c4..ba8f612e4e7 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt @@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n --FILE-- <?php -/* Prototype : string mb_encode_mimeheader(string $str [, string $charset +/* Prototype : string mb_encode_mimeheader(string $str [, string $charset * [, string $transfer-encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt index dd276485fd6..00b471a7472 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt @@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt index a0c412082dd..8f8cf3e3dcb 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt index 0dc61392712..e9d9fa2dd67 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt index 37d0c6433d6..1da923ec212 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt index 0873d809c54..11279c7bf6e 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt index ea581f39a75..9dec3c11c5d 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt @@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt index de2a8481723..3499efab800 100644 --- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt +++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt @@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n <?php /* Prototype : string mb_encode_mimeheader * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]]) - * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= + * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt index 3b2d13de513..faf6ea65e40 100644 --- a/ext/mbstring/tests/mb_ereg.phpt +++ b/ext/mbstring/tests/mb_ereg.phpt @@ -18,10 +18,10 @@ output_handler= $pat = mb_convert_encoding( $pat, $test_enc, $in_enc ); $str = mb_convert_encoding( $str, $test_enc, $in_enc ); printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( ' ', $reg ), $in_enc, $test_enc )) : '' ) ); - } + } function do_tests( $enc ) { test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" ); - $pat = '([-]+) ([ -]+)([-]+) ([-]+)$'; + $pat = '([-]+) ([ -]+)([-]+) ([-]+)$'; test_ereg( $enc, $pat, ' ' ); test_ereg( $enc, $pat, ' ' ); } diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt index ff64666f083..021200dfdef 100644 --- a/ext/mbstring/tests/mb_ereg_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg() function : basic functionality +Test mb_ereg() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt index 21216257cd7..2081f54b4ce 100644 --- a/ext/mbstring/tests/mb_ereg_error.phpt +++ b/ext/mbstring/tests/mb_ereg_error.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt index f730a637d32..a67acc3c596 100644 --- a/ext/mbstring/tests/mb_ereg_match_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i --FILE-- <?php /* Prototype : bool mb_ereg_match(string $pattern, string $string [,string $option]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ @@ -27,7 +27,7 @@ $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXv echo "\n-- ASCII string 1 --\n"; var_dump(mb_ereg_match('.*def', $string_ascii)); -//will return false as pattern would match half way through string +//will return false as pattern would match half way through string echo "\n-- ASCII string 2 --\n"; var_dump(mb_ereg_match('def', $string_ascii)); diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt index aab95fe6cd3..d483b6609dd 100644 --- a/ext/mbstring/tests/mb_ereg_match_error1.phpt +++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i --FILE-- <?php /* Prototype : bool mb_ereg_match(string $pattern, string $string [,string $option]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt index 746dd4e1a47..ac30149099c 100644 --- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg_replace() function : basic +Test mb_ereg_replace() function : basic --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -7,9 +7,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab ?> --FILE-- <?php -/* Prototype : string mb_ereg_replace(string $pattern, string $replacement, +/* Prototype : string mb_ereg_replace(string $pattern, string $replacement, * string $string [, string o$ption]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt index bc138a41537..58a69c075d5 100644 --- a/ext/mbstring/tests/mb_ereg_replace_error.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg_replace() function : error conditions +Test mb_ereg_replace() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt index d07aacb7055..6a1231bf8b1 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt @@ -10,7 +10,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt index 62a65c30eee..e69e147e482 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt index 0b3dd1d78c7..2e115f5d6fe 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt index ecc7bdc1314..c85f68aa064 100644 --- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_ereg_replace() function : usage variations +Test mb_ereg_replace() function : usage variations --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab --FILE-- <?php /* Prototype : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option]) - * Description: Replace regular expression for multibyte string + * Description: Replace regular expression for multibyte string * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt index 12feec1a3ba..ae59c3e3d2d 100644 --- a/ext/mbstring/tests/mb_ereg_search_pos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt @@ -13,9 +13,9 @@ $test_str = 'I if(mb_ereg_search_init($test_str)) { $val=mb_ereg_search_pos("ntin"); - + var_dump($val); - + } else{ var_dump("false"); diff --git a/ext/mbstring/tests/mb_ereg_search_regs.phpt b/ext/mbstring/tests/mb_ereg_search_regs.phpt index 9c9132b0239..813dabf641d 100644 --- a/ext/mbstring/tests/mb_ereg_search_regs.phpt +++ b/ext/mbstring/tests/mb_ereg_search_regs.phpt @@ -7,7 +7,7 @@ function_exists('mb_ereg_search_regs') or die("skip mb_ereg_search_regs() not av ?> --FILE-- <?php - // homepage: + // homepage: //$mb_str = "Алексей Федорович Карамазов был Алексей Федорович Карамазов был kyrillischer string string"; // = "Lorem ipsum dolor sit amet" diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt index c2c0b84a856..49182248f81 100644 --- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt +++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt @@ -23,7 +23,7 @@ output_handler= array_shift( $regs ); printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) ); } - } + } function do_tests( $enc, $opt ) { test_search( $enc, "ϡ \n", ' (?ϡ?)[[:space:]]', $opt ); test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt ); diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt index 73d0c42a872..b879de750e9 100644 --- a/ext/mbstring/tests/mb_ereg_variation1.phpt +++ b/ext/mbstring/tests/mb_ereg_variation1.phpt @@ -8,8 +8,8 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string - * Source code: ext/mbstring/php_mbregex.c + * Description: Regular expression match for multibyte string + * Source code: ext/mbstring/php_mbregex.c */ /* diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt index 0c8560022c8..f6a93ebc832 100644 --- a/ext/mbstring/tests/mb_ereg_variation2.phpt +++ b/ext/mbstring/tests/mb_ereg_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt index a71f2395da1..756e8761267 100644 --- a/ext/mbstring/tests/mb_ereg_variation3.phpt +++ b/ext/mbstring/tests/mb_ereg_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt index 80c879e38ca..fa32c2091f5 100644 --- a/ext/mbstring/tests/mb_ereg_variation4.phpt +++ b/ext/mbstring/tests/mb_ereg_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt index 22d70146a1c..5a2e746dd68 100644 --- a/ext/mbstring/tests/mb_ereg_variation6.phpt +++ b/ext/mbstring/tests/mb_ereg_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt index 41c427162e5..e35b9ef5cf2 100644 --- a/ext/mbstring/tests/mb_ereg_variation7.phpt +++ b/ext/mbstring/tests/mb_ereg_variation7.phpt @@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build --FILE-- <?php /* Prototype : int mb_ereg(string $pattern, string $string [, array $registers]) - * Description: Regular expression match for multibyte string + * Description: Regular expression match for multibyte string * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt index 6e72c5d590f..3a4916d7511 100644 --- a/ext/mbstring/tests/mb_http_input.phpt +++ b/ext/mbstring/tests/mb_http_input.phpt @@ -1,5 +1,5 @@ --TEST-- -mb_http_input() +mb_http_input() --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt index acb3c6fbb6b..6ef4be23d90 100644 --- a/ext/mbstring/tests/mb_internal_encoding.phpt +++ b/ext/mbstring/tests/mb_internal_encoding.phpt @@ -4,7 +4,7 @@ mb_internal_encoding() <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> --FILE-- <?php -// TODO: +// TODO: //$debug = true; ini_set('include_path', dirname(__FILE__)); include_once('common.inc'); diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt index a289dcf8de1..48327304ccc 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt index 4f9a6a6026a..8090b47be58 100644 --- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt @@ -13,8 +13,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt index 53d47684d95..c16d5e3bda3 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or - * Returns the current internal encoding as a string + * Description: Sets the current internal encoding or + * Returns the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt index d0a1653ebec..13fa3f59c14 100644 --- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or - * Returns the current internal encoding as a string + * Description: Sets the current internal encoding or + * Returns the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt index cd7fe6139dc..954f7aecc2a 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt index 914041c9149..216c789c54c 100644 --- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt @@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n --FILE-- <?php /* Prototype : string mb_internal_encoding([string $encoding]) - * Description: Sets the current internal encoding or Returns - * the current internal encoding as a string + * Description: Sets the current internal encoding or Returns + * the current internal encoding as a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_basic.phpt b/ext/mbstring/tests/mb_regex_encoding_basic.phpt index a0a41e96773..8da42ad7c77 100644 --- a/ext/mbstring/tests/mb_regex_encoding_basic.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_basic.phpt @@ -8,8 +8,8 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : proto string mb_regex_encoding([string encoding]) - * Description: Returns the current encoding for regex as a string. - * Source code: ext/mbstring/php_mbregex.c + * Description: Returns the current encoding for regex as a string. + * Source code: ext/mbstring/php_mbregex.c */ /* diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt index 4c5456d36c9..9609dc22d59 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_error2.phpt b/ext/mbstring/tests/mb_regex_encoding_error2.phpt index c752609daf3..eae246dced4 100644 --- a/ext/mbstring/tests/mb_regex_encoding_error2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt index cda29cbbe07..c3bb50ce807 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt index fc9c6003715..baaab535d4e 100644 --- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt +++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava --FILE-- <?php /* Prototype : string mb_regex_encoding([string $encoding]) - * Description: Returns the current encoding for regex as a string. + * Description: Returns the current encoding for regex as a string. * Source code: ext/mbstring/php_mbregex.c */ diff --git a/ext/mbstring/tests/mb_split_error.phpt b/ext/mbstring/tests/mb_split_error.phpt index 3902317ccf7..b307e404931 100644 --- a/ext/mbstring/tests/mb_split_error.phpt +++ b/ext/mbstring/tests/mb_split_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_split() function : error conditions +Test mb_split() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_split_variation1.phpt b/ext/mbstring/tests/mb_split_variation1.phpt index 0f71b2e72c9..7d2f952bff6 100644 --- a/ext/mbstring/tests/mb_split_variation1.phpt +++ b/ext/mbstring/tests/mb_split_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_split_variation2.phpt b/ext/mbstring/tests/mb_split_variation2.phpt index cb1d513d4b3..2ef402f205d 100644 --- a/ext/mbstring/tests/mb_split_variation2.phpt +++ b/ext/mbstring/tests/mb_split_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt index b3c973a5e39..c5e6783f98d 100644 --- a/ext/mbstring/tests/mb_split_variation3.phpt +++ b/ext/mbstring/tests/mb_split_variation3.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : proto array mb_split(string pattern, string string [, int limit]) - * Description: split multibyte string into array by regular expression + * Description: split multibyte string into array by regular expression * Source code: ext/mbstring/php_mbregex.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt index fe8d52e1224..0826b3e8787 100644 --- a/ext/mbstring/tests/mb_stripos_basic.phpt +++ b/ext/mbstring/tests/mb_stripos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt index 06d57ac597f..3038bb34501 100644 --- a/ext/mbstring/tests/mb_stripos_basic2.phpt +++ b/ext/mbstring/tests/mb_stripos_basic2.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt index d255e05c29d..3f1ab01bc13 100644 --- a/ext/mbstring/tests/mb_stripos_error1.phpt +++ b/ext/mbstring/tests/mb_stripos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt index 00b442575ad..bbf1fb7a9a0 100644 --- a/ext/mbstring/tests/mb_stripos_error2.phpt +++ b/ext/mbstring/tests/mb_stripos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt index 8237534ab19..7ecbbe9e70f 100644 --- a/ext/mbstring/tests/mb_stripos_variation1.phpt +++ b/ext/mbstring/tests/mb_stripos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt index 9db38dea0a6..b92aceecdbc 100644 --- a/ext/mbstring/tests/mb_stripos_variation2.phpt +++ b/ext/mbstring/tests/mb_stripos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt index a91f8763084..e762bb4e713 100644 --- a/ext/mbstring/tests/mb_stripos_variation4.phpt +++ b/ext/mbstring/tests/mb_stripos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this --FILE-- <?php /* Prototype : int mb_stripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of first occurrence of a string within another, case insensitive + * Description: Finds position of first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt index f2f9555a2b3..436ac90811f 100644 --- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt @@ -14,7 +14,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this /* * Test how mb_stripos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 918bf277100..22fc5b12785 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : basic functionality +Test mb_stristr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt index d50971fd5ad..ac54d27172d 100644 --- a/ext/mbstring/tests/mb_stristr_error1.phpt +++ b/ext/mbstring/tests/mb_stristr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : error conditions +Test mb_stristr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index 91a02a5a5c5..d5abd115de3 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_stristr() function : error conditions +Test mb_stristr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt index 076d59a5492..8f01425221d 100644 --- a/ext/mbstring/tests/mb_stristr_variation1.phpt +++ b/ext/mbstring/tests/mb_stristr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt index 2467c307fe3..5842a8c6fd7 100644 --- a/ext/mbstring/tests/mb_stristr_variation2.phpt +++ b/ext/mbstring/tests/mb_stristr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt index 2333b33f7fc..b24faaeb716 100644 --- a/ext/mbstring/tests/mb_stristr_variation3.phpt +++ b/ext/mbstring/tests/mb_stristr_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -110,7 +110,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt index 40810a1a8b2..122e92fcc45 100644 --- a/ext/mbstring/tests/mb_stristr_variation4.phpt +++ b/ext/mbstring/tests/mb_stristr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt index e56f2b02c24..2fca14ff95f 100644 --- a/ext/mbstring/tests/mb_stristr_variation5.phpt +++ b/ext/mbstring/tests/mb_stristr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this --FILE-- <?php /* Prototype : string mb_stristr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another, case insensitive + * Description: Finds first occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt index 0e62b881b4b..421c4d984ba 100644 --- a/ext/mbstring/tests/mb_strlen_basic.phpt +++ b/ext/mbstring/tests/mb_strlen_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_error1.phpt b/ext/mbstring/tests/mb_strlen_error1.phpt index aff78d60f3e..6508d769a8c 100644 --- a/ext/mbstring/tests/mb_strlen_error1.phpt +++ b/ext/mbstring/tests/mb_strlen_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt index a530a844173..9507fd16c5e 100644 --- a/ext/mbstring/tests/mb_strlen_error2.phpt +++ b/ext/mbstring/tests/mb_strlen_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt index 309535f5f1c..480ee6909f8 100644 --- a/ext/mbstring/tests/mb_strlen_variation1.phpt +++ b/ext/mbstring/tests/mb_strlen_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt index 4b301ce4cfe..93111271319 100644 --- a/ext/mbstring/tests/mb_strlen_variation2.phpt +++ b/ext/mbstring/tests/mb_strlen_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt index b254cbc712e..b5f36dedc1b 100644 --- a/ext/mbstring/tests/mb_strlen_variation3.phpt +++ b/ext/mbstring/tests/mb_strlen_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b --FILE-- <?php /* Prototype : int mb_strlen(string $str [, string $encoding]) - * Description: Get character numbers of a string + * Description: Get character numbers of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt index 1197fbadd7b..f55ec59f6ee 100644 --- a/ext/mbstring/tests/mb_strpos_basic.phpt +++ b/ext/mbstring/tests/mb_strpos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_error1.phpt b/ext/mbstring/tests/mb_strpos_error1.phpt index ef0cbafeff6..14ec3b0097d 100644 --- a/ext/mbstring/tests/mb_strpos_error1.phpt +++ b/ext/mbstring/tests/mb_strpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt index f75390f2c52..fc117606c94 100644 --- a/ext/mbstring/tests/mb_strpos_error2.phpt +++ b/ext/mbstring/tests/mb_strpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt index 42df52a45ff..696cc1cd898 100644 --- a/ext/mbstring/tests/mb_strpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt index 38dcbb5fb26..9dc8e2a0194 100644 --- a/ext/mbstring/tests/mb_strpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt index efb0bce79fc..b34682d5b46 100644 --- a/ext/mbstring/tests/mb_strpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strpos_variation3.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt index ece6bfa1553..f9b8d9bcfdd 100644 --- a/ext/mbstring/tests/mb_strpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strpos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt index 1dccce63852..404af22c457 100644 --- a/ext/mbstring/tests/mb_strpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strpos_variation5.phpt @@ -8,13 +8,13 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b --FILE-- <?php /* Prototype : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of first occurrence of a string within another + * Description: Find position of first occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ /* * Test how mb_strpos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index a6574bcb09f..2d8b8009c06 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrchr() function : basic functionality +Test mb_strrchr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt index 117680c4242..2878871dd82 100644 --- a/ext/mbstring/tests/mb_strrchr_error1.phpt +++ b/ext/mbstring/tests/mb_strrchr_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index 3aad8f7667b..e81e1befde9 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrchr() function : error conditions +Test mb_strrchr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt index 93584abe1ce..da635fb74a6 100644 --- a/ext/mbstring/tests/mb_strrchr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt index d1cddbc0bc3..942980e5fdf 100644 --- a/ext/mbstring/tests/mb_strrchr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt index 376daec7c0a..0664a163021 100644 --- a/ext/mbstring/tests/mb_strrchr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -110,7 +110,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt index 78d8ca309d3..5ba8e0563f7 100644 --- a/ext/mbstring/tests/mb_strrchr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt index dac9dca76a3..869fdde76f0 100644 --- a/ext/mbstring/tests/mb_strrchr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index fc0040101e0..053a1cf7269 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this --FILE-- <?php /* Prototype : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another + * Description: Finds the last occurrence of a character in a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt index 5cba03f4b9e..4f82f224749 100644 --- a/ext/mbstring/tests/mb_strrichr_basic.phpt +++ b/ext/mbstring/tests/mb_strrichr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : basic functionality +Test mb_strrichr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt index 3d2716f6abd..a8c8cd49733 100644 --- a/ext/mbstring/tests/mb_strrichr_error1.phpt +++ b/ext/mbstring/tests/mb_strrichr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : error conditions +Test mb_strrichr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index ef9f2e2696e..fec201e99a6 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strrichr() function : error conditions +Test mb_strrichr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt index a786eff155f..afc01e70fbc 100644 --- a/ext/mbstring/tests/mb_strrichr_variation1.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt index 80de558edc9..b389f607218 100644 --- a/ext/mbstring/tests/mb_strrichr_variation2.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt index 5532804a953..c2cccaa3754 100644 --- a/ext/mbstring/tests/mb_strrichr_variation3.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -110,7 +110,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt index c6d6e602817..adcccee2090 100644 --- a/ext/mbstring/tests/mb_strrichr_variation4.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index e279fe1e89e..be28a5955c9 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th --FILE-- <?php /* Prototype : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds the last occurrence of a character in a string within another, case insensitive + * Description: Finds the last occurrence of a character in a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt index 530c0fe3c2e..685314d58d3 100644 --- a/ext/mbstring/tests/mb_strripos_basic.phpt +++ b/ext/mbstring/tests/mb_strripos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt index ea3918d4d9b..f2255249739 100644 --- a/ext/mbstring/tests/mb_strripos_basic2.phpt +++ b/ext/mbstring/tests/mb_strripos_basic2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt index 23829a132ad..6c2d31376e8 100644 --- a/ext/mbstring/tests/mb_strripos_error1.phpt +++ b/ext/mbstring/tests/mb_strripos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt index 4bc0888c64b..ae4ee7d0178 100644 --- a/ext/mbstring/tests/mb_strripos_error2.phpt +++ b/ext/mbstring/tests/mb_strripos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt index 63ef9a34fc0..0ba21a5624d 100644 --- a/ext/mbstring/tests/mb_strripos_variation1.phpt +++ b/ext/mbstring/tests/mb_strripos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt index 51f00b3a0c0..6777145e130 100644 --- a/ext/mbstring/tests/mb_strripos_variation2.phpt +++ b/ext/mbstring/tests/mb_strripos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt index b5bfea654b8..d542b54b3d3 100644 --- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt @@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt index 55aa897d8f6..195060be072 100644 --- a/ext/mbstring/tests/mb_strripos_variation4.phpt +++ b/ext/mbstring/tests/mb_strripos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt index 0a83bb94ba6..11d289f52d3 100644 --- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt +++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt @@ -8,14 +8,14 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th --FILE-- <?php /* Prototype : int mb_strripos(string haystack, string needle [, int offset [, string encoding]]) - * Description: Finds position of last occurrence of a string within another, case insensitive + * Description: Finds position of last occurrence of a string within another, case insensitive * Source code: ext/mbstring/mbstring.c * Alias to functions: */ /* * Test how mb_strripos() behaves when passed different integers as $offset argument - * The character length of $string_ascii and $string_mb is the same, + * The character length of $string_ascii and $string_mb is the same, * and the needle appears at the same positions in both strings */ diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt index aac9fc020f9..bf035a412d4 100644 --- a/ext/mbstring/tests/mb_strrpos_basic.phpt +++ b/ext/mbstring/tests/mb_strrpos_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt index 892599acc2f..f8e90d03b3c 100644 --- a/ext/mbstring/tests/mb_strrpos_error1.phpt +++ b/ext/mbstring/tests/mb_strrpos_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt index fa3719509c0..ed69ce53cd0 100644 --- a/ext/mbstring/tests/mb_strrpos_error2.phpt +++ b/ext/mbstring/tests/mb_strrpos_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt index 8f120c32533..cd6c111206b 100644 --- a/ext/mbstring/tests/mb_strrpos_variation1.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt index 4019154bf8b..8a23321c026 100644 --- a/ext/mbstring/tests/mb_strrpos_variation2.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt index dc691b0ef30..99e5962f671 100644 --- a/ext/mbstring/tests/mb_strrpos_variation3.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt index 1bd764658c3..a7011dd278c 100644 --- a/ext/mbstring/tests/mb_strrpos_variation4.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt index 6205ecac487..4eb8c1f9be0 100644 --- a/ext/mbstring/tests/mb_strrpos_variation5.phpt +++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this --FILE-- <?php /* Prototype : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]]) - * Description: Find position of last occurrence of a string within another + * Description: Find position of last occurrence of a string within another * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index 1b75b8c8b16..5a9068e606c 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : basic functionality +Test mb_strstr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt index cd0af724a37..82ae618b5dc 100644 --- a/ext/mbstring/tests/mb_strstr_error1.phpt +++ b/ext/mbstring/tests/mb_strstr_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : error conditions +Test mb_strstr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index a36b5fcd0de..81daccb432c 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_strstr() function : error conditions +Test mb_strstr() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt index 2bf155a7e0d..5dfeaee8a1f 100644 --- a/ext/mbstring/tests/mb_strstr_variation1.phpt +++ b/ext/mbstring/tests/mb_strstr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for haystack diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt index 687374f2e43..b14da94fabe 100644 --- a/ext/mbstring/tests/mb_strstr_variation2.phpt +++ b/ext/mbstring/tests/mb_strstr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for needle diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt index fbad4fe81e5..462c993b748 100644 --- a/ext/mbstring/tests/mb_strstr_variation3.phpt +++ b/ext/mbstring/tests/mb_strstr_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -110,7 +110,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for part diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt index ef661e8265b..088f4dac0db 100644 --- a/ext/mbstring/tests/mb_strstr_variation4.phpt +++ b/ext/mbstring/tests/mb_strstr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for encoding diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt index 4bb084c27ec..2b6fd238b85 100644 --- a/ext/mbstring/tests/mb_strstr_variation5.phpt +++ b/ext/mbstring/tests/mb_strstr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt index 25d4a43775b..c2438b771e9 100644 --- a/ext/mbstring/tests/mb_strstr_variation6.phpt +++ b/ext/mbstring/tests/mb_strstr_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b --FILE-- <?php /* Prototype : string mb_strstr(string haystack, string needle[, bool part[, string encoding]]) - * Description: Finds first occurrence of a string within another + * Description: Finds first occurrence of a string within another * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt index 582cc1d0435..9fa3a5b1aca 100644 --- a/ext/mbstring/tests/mb_substitute_character_basic.phpt +++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : basic functionality +Test mb_substitute_character() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt index a933aa1a90b..4fe13683eac 100644 --- a/ext/mbstring/tests/mb_substitute_character_error.phpt +++ b/ext/mbstring/tests/mb_substitute_character_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : error conditions +Test mb_substitute_character() function : error conditions --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt index f39364da479..10df85ea279 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substitute_character() function : usage variation +Test mb_substitute_character() function : usage variation --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt index ad5929b0136..d447dc87d71 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character( --FILE-- <?php /* Prototype : mixed mb_substitute_character([mixed substchar]) - * Description: Sets the current substitute_character or returns the current substitute_character + * Description: Sets the current substitute_character or returns the current substitute_character * Source code: ext/mbstring/mbstring.c * Alias to functions: */ diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt index 8842e7a3d18..2edb91291f0 100644 --- a/ext/mbstring/tests/mb_substr_basic.phpt +++ b/ext/mbstring/tests/mb_substr_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substr() function : basic functionality +Test mb_substr() function : basic functionality --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -10,7 +10,7 @@ mbstring.internal_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt index 13cd4a7f25c..1c2af8b3ff9 100644 --- a/ext/mbstring/tests/mb_substr_count_basic.phpt +++ b/ext/mbstring/tests/mb_substr_count_basic.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt index 881ca0c22ee..50c6765541b 100644 --- a/ext/mbstring/tests/mb_substr_count_error1.phpt +++ b/ext/mbstring/tests/mb_substr_count_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt index aefb2c05c8d..e715e30ad92 100644 --- a/ext/mbstring/tests/mb_substr_count_error2.phpt +++ b/ext/mbstring/tests/mb_substr_count_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt index 64d3c0f2635..86efcadad9a 100644 --- a/ext/mbstring/tests/mb_substr_count_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype :int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt index 340693dabed..48dd675fda7 100644 --- a/ext/mbstring/tests/mb_substr_count_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test mb_substr_count() function : usage variations - pass different data types as $needle arg +Test mb_substr_count() function : usage variations - pass different data types as $needle arg --SKIPIF-- <?php extension_loaded('mbstring') or die('skip'); @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt index 738ccdd00ef..3b1e442724b 100644 --- a/ext/mbstring/tests/mb_substr_count_variation3.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt index 0a98d2051b1..c38e3adca4a 100644 --- a/ext/mbstring/tests/mb_substr_count_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab --FILE-- <?php /* Prototype : int mb_substr_count(string $haystack, string $needle [, string $encoding]) - * Description: Count the number of substring occurrences + * Description: Count the number of substring occurrences * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt index e48b3193b3c..e8dfe29ad4d 100644 --- a/ext/mbstring/tests/mb_substr_error1.phpt +++ b/ext/mbstring/tests/mb_substr_error1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt index 72be974ed07..85bea20e10c 100644 --- a/ext/mbstring/tests/mb_substr_error2.phpt +++ b/ext/mbstring/tests/mb_substr_error2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt index 8c4b10ddd9d..6e5ec9ef2bb 100644 --- a/ext/mbstring/tests/mb_substr_variation1.phpt +++ b/ext/mbstring/tests/mb_substr_variation1.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt index 1cd608ef50f..5a72406b6b0 100644 --- a/ext/mbstring/tests/mb_substr_variation2.phpt +++ b/ext/mbstring/tests/mb_substr_variation2.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt index f6e711da7c5..f4a4643421e 100644 --- a/ext/mbstring/tests/mb_substr_variation4.phpt +++ b/ext/mbstring/tests/mb_substr_variation4.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt index 5c912f93b59..a9be0686fa9 100644 --- a/ext/mbstring/tests/mb_substr_variation5.phpt +++ b/ext/mbstring/tests/mb_substr_variation5.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt index cd5a26381be..b1783c839f2 100644 --- a/ext/mbstring/tests/mb_substr_variation6.phpt +++ b/ext/mbstring/tests/mb_substr_variation6.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt index 9cb433e085a..da00d4b80a9 100644 --- a/ext/mbstring/tests/mb_substr_variation7.phpt +++ b/ext/mbstring/tests/mb_substr_variation7.phpt @@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b --FILE-- <?php /* Prototype : string mb_substr(string $str, int $start [, int $length [, string $encoding]]) - * Description: Returns part of a string + * Description: Returns part of a string * Source code: ext/mbstring/mbstring.c */ diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt index 375520af880..59e82ae07f1 100644 --- a/ext/mbstring/tests/php_gr_jp_10830.phpt +++ b/ext/mbstring/tests/php_gr_jp_10830.phpt @@ -1,5 +1,5 @@ --TEST-- -php-users@php.gr.jp #10830 +php-users@php.gr.jp #10830 --SKIPIF-- <?php extension_loaded('mbstring') or die('skip mbstring not available'); diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt index 80b2f725961..b07b6f52bc2 100644 --- a/ext/mbstring/tests/simpletest.phpt +++ b/ext/mbstring/tests/simpletest.phpt @@ -18,7 +18,7 @@ $s2 = " echo "echo: ".$s1.$s2."\n"; print("print: ".$s1.$s2."\n"); printf("printf: %s%s\n",$s1, $s2); -echo sprintf("sprintf: %s%s\n",$s1, $s2); +echo sprintf("sprintf: %s%s\n",$s1, $s2); // Assign to var $s3 = $s1.$s2."\n"; diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt index 8203e0c4d97..f0c0bdbc7ac 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -7,7 +7,7 @@ require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$IS_MYSQLND) +if (!$IS_MYSQLND) die("skip mysqlnd only test"); ?> --FILE-- diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt index e1788c46c8d..fb62f9df4ed 100644 --- a/ext/oci8/tests/bug37220.phpt +++ b/ext/oci8/tests/bug37220.phpt @@ -31,7 +31,7 @@ $clob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB); $clob->writetemporary("<MYTAG/>", OCI_TEMP_CLOB); $success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS); -oci_free_statement($stmt); +oci_free_statement($stmt); $clob->close(); // Query back the change diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt index 55cc1710470..53827847e7c 100644 --- a/ext/oci8/tests/connect_scope1.phpt +++ b/ext/oci8/tests/connect_scope1.phpt @@ -18,7 +18,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt index 76ed42ca178..1c7e88e896c 100644 --- a/ext/oci8/tests/connect_scope2.phpt +++ b/ext/oci8/tests/connect_scope2.phpt @@ -18,7 +18,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/opcache/tests/zzz_basic_logging.phpt b/ext/opcache/tests/zzz_basic_logging.phpt index 809046ed57d..e8d84a93042 100644 --- a/ext/opcache/tests/zzz_basic_logging.phpt +++ b/ext/opcache/tests/zzz_basic_logging.phpt @@ -1,7 +1,7 @@ --TEST-- Test basic logging for the Opcache --DESCRIPTION-- -This test runs a simple PHP script and ensures the Opcache +This test runs a simple PHP script and ensures the Opcache outputs the correct logging at the highest log_verbosity_level --INI-- diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt index 2f1998a1bb4..9eb27fa0f0f 100644 --- a/ext/openssl/tests/bug37820.phpt +++ b/ext/openssl/tests/bug37820.phpt @@ -1,5 +1,5 @@ --TEST-- -openssl_sign/verify: accept different algos +openssl_sign/verify: accept different algos --SKIPIF-- <?php if (!extension_loaded("openssl")) die("skip"); diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 3969d993bfa..f49b77485c4 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -1,5 +1,5 @@ --TEST-- -openssl key from zval leaks +openssl key from zval leaks --SKIPIF-- <?php if (!extension_loaded("openssl")) die("skip"); diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt index dec675cebc1..fa25d93d62e 100644 --- a/ext/openssl/tests/bug38261.phpt +++ b/ext/openssl/tests/bug38261.phpt @@ -1,5 +1,5 @@ --TEST-- -openssl key from zval leaks +openssl key from zval leaks --SKIPIF-- <?php if (!extension_loaded("openssl")) die("skip"); diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt index d0172371f6d..5bfa0cebb09 100644 --- a/ext/openssl/tests/bug46127.phpt +++ b/ext/openssl/tests/bug46127.phpt @@ -1,5 +1,5 @@ --TEST-- -#46127, openssl_sign/verify: accept different algos +#46127, openssl_sign/verify: accept different algos --SKIPIF-- <?php if (!extension_loaded("openssl")) die("skip openssl not loaded"); diff --git a/ext/pcntl/tests/pcntl_fork_variation.phpt b/ext/pcntl/tests/pcntl_fork_variation.phpt index c0708a93df2..4a839665334 100644 --- a/ext/pcntl/tests/pcntl_fork_variation.phpt +++ b/ext/pcntl/tests/pcntl_fork_variation.phpt @@ -24,7 +24,7 @@ if ($pid > 0) { echo "father ($pid) doesn't know its grandsons\n"; } } -else +else { echo "son ($pid)\n"; $pid2 = pcntl_fork(); @@ -33,7 +33,7 @@ else pcntl_wait($status2); echo "son is father of $pid2\n"; } - else + else { echo "grandson ($pid2)\n"; } diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt index 6dcb2bf6940..dcca892788b 100644 --- a/ext/pcre/tests/locales.phpt +++ b/ext/pcre/tests/locales.phpt @@ -1,7 +1,7 @@ --TEST-- Localized match --SKIPIF-- -<?php +<?php if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available'); diff --git a/ext/pcre/tests/pcre.constants.phpt b/ext/pcre/tests/pcre.constants.phpt index 108f4322532..ad012e7e699 100644 --- a/ext/pcre/tests/pcre.constants.phpt +++ b/ext/pcre/tests/pcre.constants.phpt @@ -1,5 +1,5 @@ --TEST-- -Test for pre-defined pcre constants +Test for pre-defined pcre constants --FILE-- <?php diff --git a/ext/pcre/tests/preg_grep_basic.phpt b/ext/pcre/tests/preg_grep_basic.phpt index fe9d7ceaa78..4874aa8ab63 100644 --- a/ext/pcre/tests/preg_grep_basic.phpt +++ b/ext/pcre/tests/preg_grep_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_grep() function : basic functionality +Test preg_grep() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_match_all_basic.phpt b/ext/pcre/tests/preg_match_all_basic.phpt index 773bad30537..63e9b6a6ddf 100644 --- a/ext/pcre/tests/preg_match_all_basic.phpt +++ b/ext/pcre/tests/preg_match_all_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_match_all() function : basic functionality +Test preg_match_all() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_match_all_edit_basic.phpt b/ext/pcre/tests/preg_match_all_edit_basic.phpt index 1f59bf6affd..27034f90f18 100644 --- a/ext/pcre/tests/preg_match_all_edit_basic.phpt +++ b/ext/pcre/tests/preg_match_all_edit_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test preg_match_all() function : basic functionality +Test preg_match_all() function : basic functionality --FILE-- <?php /* Prototype : proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) - * Description: Perform a Perl-style global regular expression match + * Description: Perform a Perl-style global regular expression match * Source code: ext/pcre/php_pcre.c * Alias to functions: */ @@ -22,7 +22,7 @@ var_dump($match3); var_dump(preg_match_all('/\d{2}$/', $string, $match4)); //tries to find 2 digits at the end of a string (0 matches) var_dump($match4); -var_dump(preg_match_all('/(This is a ){2}(.*)\stest/', $string, $match5)); //tries to find "This is aThis is a [...] test" (0 matches) +var_dump(preg_match_all('/(This is a ){2}(.*)\stest/', $string, $match5)); //tries to find "This is aThis is a [...] test" (0 matches) var_dump($match5); ?> --EXPECT-- diff --git a/ext/pcre/tests/preg_match_all_error3.phpt b/ext/pcre/tests/preg_match_all_error3.phpt index 547ff03e44e..6c1422b61a9 100644 --- a/ext/pcre/tests/preg_match_all_error3.phpt +++ b/ext/pcre/tests/preg_match_all_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_match_all() function : error conditions +Test preg_match_all() function : error conditions --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt index c84c763851f..939773f62e7 100644 --- a/ext/pcre/tests/preg_match_basic.phpt +++ b/ext/pcre/tests/preg_match_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_match() function : basic functionality +Test preg_match() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_match_basic_edit.phpt b/ext/pcre/tests/preg_match_basic_edit.phpt index d08c474d612..d4339a89553 100644 --- a/ext/pcre/tests/preg_match_basic_edit.phpt +++ b/ext/pcre/tests/preg_match_basic_edit.phpt @@ -1,9 +1,9 @@ --TEST-- -Test preg_match() function : basic functionality +Test preg_match() function : basic functionality --FILE-- <?php /* Prototype : proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) - * Description: Perform a Perl-style regular expression match + * Description: Perform a Perl-style regular expression match * Source code: ext/pcre/php_pcre.c * Alias to functions: */ diff --git a/ext/pcre/tests/preg_quote_basic.phpt b/ext/pcre/tests/preg_quote_basic.phpt index c78f5665c0d..2697a801556 100644 --- a/ext/pcre/tests/preg_quote_basic.phpt +++ b/ext/pcre/tests/preg_quote_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_quote() function : basic functionality +Test preg_quote() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_quote_error.phpt b/ext/pcre/tests/preg_quote_error.phpt index 30b832dbf96..b5dd733b2f6 100644 --- a/ext/pcre/tests/preg_quote_error.phpt +++ b/ext/pcre/tests/preg_quote_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_quote() function : error conditions - wrong numbers of parameters +Test preg_quote() function : error conditions - wrong numbers of parameters --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt index 6962bce255f..9c2eba47d82 100644 --- a/ext/pcre/tests/preg_replace_basic.phpt +++ b/ext/pcre/tests/preg_replace_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_replace() function : basic functionality +Test preg_replace() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_replace_callback_basic.phpt b/ext/pcre/tests/preg_replace_callback_basic.phpt index 21560572d56..c89fa8c12c5 100644 --- a/ext/pcre/tests/preg_replace_callback_basic.phpt +++ b/ext/pcre/tests/preg_replace_callback_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_replace_callback() function : basic functionality +Test preg_replace_callback() function : basic functionality --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_replace_callback_error.phpt b/ext/pcre/tests/preg_replace_callback_error.phpt index 9371fcf1bf2..2834eea4db6 100644 --- a/ext/pcre/tests/preg_replace_callback_error.phpt +++ b/ext/pcre/tests/preg_replace_callback_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_replace_callback() function : error +Test preg_replace_callback() function : error --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt index a00b97c1bb4..add24fbc82d 100644 --- a/ext/pcre/tests/preg_replace_callback_error1.phpt +++ b/ext/pcre/tests/preg_replace_callback_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_replace_callback() function : error +Test preg_replace_callback() function : error --FILE-- <?php /* diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt index 0c0adee7cae..b272f379bee 100644 --- a/ext/pcre/tests/preg_replace_edit_basic.phpt +++ b/ext/pcre/tests/preg_replace_edit_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test preg_replace() function : basic +Test preg_replace() function : basic --FILE-- <?php /* Prototype : proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) - * Description: Perform Perl-style regular expression replacement. + * Description: Perform Perl-style regular expression replacement. * Source code: ext/pcre/php_pcre.c * Alias to functions: */ diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt index 5d23ce6df13..c33640920b5 100644 --- a/ext/pcre/tests/preg_split_basic.phpt +++ b/ext/pcre/tests/preg_split_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test preg_split() function : basic functionality +Test preg_split() function : basic functionality --FILE-- <?php /* diff --git a/ext/pdo/tests/bug_36798.phpt b/ext/pdo/tests/bug_36798.phpt index 9da703e84ff..0ca0beaa8e7 100644 --- a/ext/pdo/tests/bug_36798.phpt +++ b/ext/pdo/tests/bug_36798.phpt @@ -1,7 +1,7 @@ --TEST-- PDO Common: Bug #36798 (Error parsing named parameters with queries containing high-ascii chars) --SKIPIF-- -<?php +<?php if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); @@ -32,7 +32,7 @@ $row = $stmt->fetch(PDO::FETCH_NUM); var_dump( $row ); ?> ---EXPECT-- +--EXPECT-- array(1) { [0]=> string(1) "" diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt index fb25fc52bcc..b1c18fbefd6 100644 --- a/ext/pdo/tests/pdo_021.phpt +++ b/ext/pdo/tests/pdo_021.phpt @@ -44,7 +44,7 @@ echo 'There are ' . $num . " rows in the table.\n"; // Insert using named parameters $stmt2 = $db->prepare("INSERT INTO test VALUES(:first, :second, :third)"); foreach ($data as $row) { - $stmt2->execute(array(':first'=>($row[0] + 5), ':second'=>$row[1], + $stmt2->execute(array(':first'=>($row[0] + 5), ':second'=>$row[1], ':third'=>$row[2])); } diff --git a/ext/pdo_mysql/tests/bug_39483.phpt b/ext/pdo_mysql/tests/bug_39483.phpt index c20f4a36027..c493b8c03fb 100644 Binary files a/ext/pdo_mysql/tests/bug_39483.phpt and b/ext/pdo_mysql/tests/bug_39483.phpt differ diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt index fba1c2433e3..090f97d0431 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt @@ -43,7 +43,7 @@ if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) { $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; } } else if (MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) { - /* XXX the MySQL client library version isn't exposed with any + /* XXX the MySQL client library version isn't exposed with any constants, the single possibility is to use the PDO::getAttribute(). This however will fail with no connection. */ $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; diff --git a/ext/pdo_odbc/tests/long_columns.phpt b/ext/pdo_odbc/tests/long_columns.phpt index cc7b19517e4..fda63c47cb6 100644 --- a/ext/pdo_odbc/tests/long_columns.phpt +++ b/ext/pdo_odbc/tests/long_columns.phpt @@ -35,7 +35,7 @@ if (!isset($config['ENV']['PDOTEST_DSN']) || $config['ENV']['PDOTEST_DSN']===fal // -otherwise, you'll have to open MS Access, create a database, then load that file in this Window to map it to a DSN // 7. set the environment variable PDOTEST_DSN="odbc:<system dsn from step 5>" ex: SET PDOTEST_DSN=odbc:accdb12 // -note: on Windows, " is included in environment variable -// +// // easy way to compile: // configure --disable-all --enable-cli --enable-zts --enable-pdo --with-pdo-odbc --enable-debug // configure --disable-all --eanble-cli --enable-pdo --with-pdo-odbc=unixODBC,/usr,/usr --with-unixODBC=/usr --enable-debug diff --git a/ext/pdo_pgsql/tests/bug72294.phpt b/ext/pdo_pgsql/tests/bug72294.phpt index d6bb6617338..484a6f5765c 100644 --- a/ext/pdo_pgsql/tests/bug72294.phpt +++ b/ext/pdo_pgsql/tests/bug72294.phpt @@ -106,7 +106,7 @@ class PreparedStatementCache } } -class DatabaseTest extends PHPUnit_Framework_TestCase +class DatabaseTest extends PHPUnit_Framework_TestCase { public function testIt() { diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt index 8c833cced86..8fc5bbf9476 100644 --- a/ext/pdo_pgsql/tests/bug75402.phpt +++ b/ext/pdo_pgsql/tests/bug75402.phpt @@ -63,7 +63,7 @@ $sql = "SELECT if ($db) { $stmt = $db->prepare($sql, array( - // With the following options memory is not being + // With the following options memory is not being // deallocated \PDO::ATTR_CURSOR => \PDO::CURSOR_SCROLL // With the following option memory is de-allocated diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt index 31d7752174d..552038069c3 100644 --- a/ext/pdo_pgsql/tests/copy_from.phpt +++ b/ext/pdo_pgsql/tests/copy_from.phpt @@ -119,7 +119,7 @@ try { } $db->rollback(); -// Clean up +// Clean up foreach (array($filename, $filenameWithDifferentNullValues, $filenameWithDifferentNullValuesAndSelectedFields) as $f) { @unlink($f); } diff --git a/ext/pgsql/tests/9999dropdb.phpt b/ext/pgsql/tests/9999dropdb.phpt index 80502e54b62..f3583a545b6 100644 --- a/ext/pgsql/tests/9999dropdb.phpt +++ b/ext/pgsql/tests/9999dropdb.phpt @@ -4,7 +4,7 @@ PostgreSQL drop db <?php include("skipif.inc"); ?> --FILE-- <?php -// drop test table +// drop test table include('config.inc'); diff --git a/ext/pgsql/tests/bug71998.phpt b/ext/pgsql/tests/bug71998.phpt index d32c47bb434..f69261c1c07 100644 --- a/ext/pgsql/tests/bug71998.phpt +++ b/ext/pgsql/tests/bug71998.phpt @@ -4,7 +4,7 @@ Bug #71998 Function pg_insert does not insert when column type = inet <?php include("skipif.inc"); ?> --FILE-- <?php -// Kudos for the IP regex to +// Kudos for the IP regex to // http://stackoverflow.com/a/17871737/3358424 include('config.inc'); diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt index 2ce15bdaf4b..6b6cc3ec67a 100644 --- a/ext/pgsql/tests/bug72197.phpt +++ b/ext/pgsql/tests/bug72197.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #72197 pg_lo_create arbitrary read +Bug #72197 pg_lo_create arbitrary read --SKIPIF-- <?php include("skipif.inc"); ?> --FILE-- diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt index 74273b850b0..d62f3c2b72f 100644 --- a/ext/phar/tests/bug65028.phpt +++ b/ext/phar/tests/bug65028.phpt @@ -122,7 +122,7 @@ $files = array( "style/Fusonic/40components.css", "style/_emptyDirectory", "index.php", -// "a", // This will make the test pass +// "a", // This will make the test pass ); // Create Phar with the filenames above diff --git a/ext/posix/tests/posix_get_last_error_error.phpt b/ext/posix/tests/posix_get_last_error_error.phpt index 4ef1d5170d9..5400b615982 100644 --- a/ext/posix/tests/posix_get_last_error_error.phpt +++ b/ext/posix/tests/posix_get_last_error_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_get_last_error() function : error conditions +Test posix_get_last_error() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; @@ -7,7 +7,7 @@ Test posix_get_last_error() function : error conditions --FILE-- <?php /* Prototype : proto int posix_get_last_error(void) - * Description: Retrieve the error number set by the last posix function which failed. + * Description: Retrieve the error number set by the last posix function which failed. * Source code: ext/posix/posix.c * Alias to functions: posix_errno */ diff --git a/ext/posix/tests/posix_getgid_error.phpt b/ext/posix/tests/posix_getgid_error.phpt index fdcb8e9697f..f02d07413ac 100644 --- a/ext/posix/tests/posix_getgid_error.phpt +++ b/ext/posix/tests/posix_getgid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getgid() function : error conditions +Test posix_getgid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt index 3b57eaeaf37..be717da64aa 100644 --- a/ext/posix/tests/posix_getgrgid_basic.phpt +++ b/ext/posix/tests/posix_getgrgid_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getgrgid() function : basic functionality +Test posix_getgrgid() function : basic functionality --SKIPIF-- <?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); diff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt index e51823bf654..ef7fa57a9db 100644 --- a/ext/posix/tests/posix_getgrgid_error.phpt +++ b/ext/posix/tests/posix_getgrgid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getgrgid() function : error conditions +Test posix_getgrgid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt index 80c12be0896..9bf807ad142 100644 --- a/ext/posix/tests/posix_getgrgid_variation.phpt +++ b/ext/posix/tests/posix_getgrgid_variation.phpt @@ -72,7 +72,7 @@ foreach($values as $value) { echo "\nArg value $value \n"; $result = posix_getgrgid($value); if ((is_array($result) && (count($result) == 4)) - || + || ($result === false)) { echo "valid output\n"; } else { diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt index c6294fe1271..2d309e61d44 100644 --- a/ext/posix/tests/posix_getgroups_basic.phpt +++ b/ext/posix/tests/posix_getgroups_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getgroups() function : basic functionality +Test posix_getgroups() function : basic functionality --SKIPIF-- <?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); diff --git a/ext/posix/tests/posix_getpgid_basic.phpt b/ext/posix/tests/posix_getpgid_basic.phpt index a006a368581..500bc18cff8 100644 --- a/ext/posix/tests/posix_getpgid_basic.phpt +++ b/ext/posix/tests/posix_getpgid_basic.phpt @@ -1,18 +1,18 @@ --TEST-- -Test posix_getpgid() function : basic functionality +Test posix_getpgid() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of posix_getpgid function\n"; - + $pid = posix_getpid(); $pgid = posix_getpgid($pid); - + var_dump($pgid); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt index 3d19256d191..6a5e7fd5a9c 100644 --- a/ext/posix/tests/posix_getpgid_variation.phpt +++ b/ext/posix/tests/posix_getpgid_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getpgid() function : variation +Test posix_getpgid() function : variation --SKIPIF-- <?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); diff --git a/ext/posix/tests/posix_getpgrp_basic.phpt b/ext/posix/tests/posix_getpgrp_basic.phpt index 185bbbefca3..f460e347ce8 100644 --- a/ext/posix/tests/posix_getpgrp_basic.phpt +++ b/ext/posix/tests/posix_getpgrp_basic.phpt @@ -1,17 +1,17 @@ --TEST-- -Test posix_getpgrp() function : basic functionality +Test posix_getpgrp() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX getpgrp function\n"; - + $pgrp = posix_getpgrp(); - + var_dump($pgrp); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_getpgrp_error.phpt b/ext/posix/tests/posix_getpgrp_error.phpt index 0229270b63d..6076d688c9a 100644 --- a/ext/posix/tests/posix_getpgrp_error.phpt +++ b/ext/posix/tests/posix_getpgrp_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getpgrp() function : error conditions +Test posix_getpgrp() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getpid_basic.phpt b/ext/posix/tests/posix_getpid_basic.phpt index 0302922be10..40689583b58 100644 --- a/ext/posix/tests/posix_getpid_basic.phpt +++ b/ext/posix/tests/posix_getpid_basic.phpt @@ -1,17 +1,17 @@ --TEST-- -Test posix_getpid() function : basic functionality +Test posix_getpid() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX getpid function\n"; - + $pid = posix_getpid(); - + var_dump($pid); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_getpid_error.phpt b/ext/posix/tests/posix_getpid_error.phpt index 471a8aa3ead..46131b7c9dc 100644 --- a/ext/posix/tests/posix_getpid_error.phpt +++ b/ext/posix/tests/posix_getpid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getpid() function : error conditions +Test posix_getpid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getppid_basic.phpt b/ext/posix/tests/posix_getppid_basic.phpt index 3cbf5d7a6e2..8d10afc4569 100644 --- a/ext/posix/tests/posix_getppid_basic.phpt +++ b/ext/posix/tests/posix_getppid_basic.phpt @@ -1,17 +1,17 @@ --TEST-- -Test posix_getppid() function : basic functionality +Test posix_getppid() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX getppid function\n"; - + $ppid = posix_getppid(); - + var_dump($ppid); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_getppid_error.phpt b/ext/posix/tests/posix_getppid_error.phpt index 9c3919e21cb..d962182ba4e 100644 --- a/ext/posix/tests/posix_getppid_error.phpt +++ b/ext/posix/tests/posix_getppid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getppid() function : error conditions +Test posix_getppid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getpwuid_basic.phpt b/ext/posix/tests/posix_getpwuid_basic.phpt index 7d9b8d11811..16e0ae11523 100644 --- a/ext/posix/tests/posix_getpwuid_basic.phpt +++ b/ext/posix/tests/posix_getpwuid_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getpwuid() function : basic functionality +Test posix_getpwuid() function : basic functionality --SKIPIF-- <?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); diff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt index b44584448ac..440edf6a769 100644 --- a/ext/posix/tests/posix_getpwuid_error.phpt +++ b/ext/posix/tests/posix_getpwuid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getpwuid() function : error conditions +Test posix_getpwuid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt index 27b4ca956fa..ca57d2cc83b 100644 --- a/ext/posix/tests/posix_getpwuid_variation.phpt +++ b/ext/posix/tests/posix_getpwuid_variation.phpt @@ -72,7 +72,7 @@ foreach($values as $value) { echo "\nArg value $value \n"; $result = posix_getpwuid($value); if ((is_array($result) && (count($result) == 7)) - || + || ($result === false)) { echo "valid output\n"; } else { diff --git a/ext/posix/tests/posix_getsid_basic.phpt b/ext/posix/tests/posix_getsid_basic.phpt index 6fd61e5bcac..5bf362efd44 100644 --- a/ext/posix/tests/posix_getsid_basic.phpt +++ b/ext/posix/tests/posix_getsid_basic.phpt @@ -1,18 +1,18 @@ --TEST-- -Test posix_getsid() function : basic functionality +Test posix_getsid() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of posix_getsid function\n"; - + $pid = posix_getpid(); $sid = posix_getsid($pid); - + var_dump($sid); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt index 148b09470bd..6013a40b963 100644 --- a/ext/posix/tests/posix_getsid_error.phpt +++ b/ext/posix/tests/posix_getsid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getsid() function : error conditions +Test posix_getsid() function : error conditions --DESCRIPTION-- cases: no params, wrong param, wrong param range --CREDITS-- diff --git a/ext/posix/tests/posix_getuid_error.phpt b/ext/posix/tests/posix_getuid_error.phpt index a4f6272eed9..8954108c32c 100644 --- a/ext/posix/tests/posix_getuid_error.phpt +++ b/ext/posix/tests/posix_getuid_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_getuid() function : error conditions +Test posix_getuid() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_kill_basic.phpt b/ext/posix/tests/posix_kill_basic.phpt index c45a2624d1b..fe9cf44692d 100644 --- a/ext/posix/tests/posix_kill_basic.phpt +++ b/ext/posix/tests/posix_kill_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality +Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality --SKIPIF-- <?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); diff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt index 2ca9392139b..0c8f6ef642d 100644 --- a/ext/posix/tests/posix_kill_error.phpt +++ b/ext/posix/tests/posix_kill_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_kill() function : error conditions +Test posix_kill() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt index 3b7d1f9a453..bb41e22989d 100644 --- a/ext/posix/tests/posix_setgid_basic.phpt +++ b/ext/posix/tests/posix_setgid_basic.phpt @@ -1,7 +1,7 @@ --TEST-- Test function posix_setgid() by calling it with its expected arguments --SKIPIF-- -<?php +<?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt index d8c86b046f5..46174450d85 100644 --- a/ext/posix/tests/posix_setgid_variation6.phpt +++ b/ext/posix/tests/posix_setgid_variation6.phpt @@ -1,7 +1,7 @@ --TEST-- Test function posix_setgid() by substituting argument 1 with object values. --SKIPIF-- -<?php +<?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; ?> --CREDITS-- diff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt index a016f19dd41..3007f976c63 100644 --- a/ext/posix/tests/posix_strerror_error.phpt +++ b/ext/posix/tests/posix_strerror_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_strerror() function : error conditions +Test posix_strerror() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; @@ -7,7 +7,7 @@ Test posix_strerror() function : error conditions --FILE-- <?php /* Prototype : proto string posix_strerror(int errno) - * Description: Retrieve the system error message associated with the given errno. + * Description: Retrieve the system error message associated with the given errno. * Source code: ext/posix/posix.c * Alias to functions: */ diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt index 0e1feb9de85..e8da057c7f2 100644 --- a/ext/posix/tests/posix_strerror_variation1.phpt +++ b/ext/posix/tests/posix_strerror_variation1.phpt @@ -8,7 +8,7 @@ Test posix_strerror() function : usage variations --FILE-- <?php /* Prototype : proto string posix_strerror(int errno) - * Description: Retrieve the system error message associated with the given errno. + * Description: Retrieve the system error message associated with the given errno. * Source code: ext/posix/posix.c * Alias to functions: */ diff --git a/ext/posix/tests/posix_times_basic.phpt b/ext/posix/tests/posix_times_basic.phpt index 78c53bdb1f5..ad37834fd91 100644 --- a/ext/posix/tests/posix_times_basic.phpt +++ b/ext/posix/tests/posix_times_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_times() function : basic functionality +Test posix_times() function : basic functionality --SKIPIF-- <?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); diff --git a/ext/posix/tests/posix_times_error.phpt b/ext/posix/tests/posix_times_error.phpt index 242f4499b30..0f8a9e36015 100644 --- a/ext/posix/tests/posix_times_error.phpt +++ b/ext/posix/tests/posix_times_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_times() function : error conditions +Test posix_times() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/posix/tests/posix_uname_basic.phpt b/ext/posix/tests/posix_uname_basic.phpt index 1ea3fe8fbbf..c48694579a8 100644 --- a/ext/posix/tests/posix_uname_basic.phpt +++ b/ext/posix/tests/posix_uname_basic.phpt @@ -1,17 +1,17 @@ --TEST-- -Test posix_uname() function : basic functionality +Test posix_uname() function : basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); ?> --FILE-- -<?php +<?php echo "Basic test of POSIX uname function\n"; - + $uname = posix_uname(); unset($uname['domainname']); print_r($uname); - + ?> ===DONE==== --EXPECTF-- diff --git a/ext/posix/tests/posix_uname_error.phpt b/ext/posix/tests/posix_uname_error.phpt index df5056b828f..09c435fe695 100644 --- a/ext/posix/tests/posix_uname_error.phpt +++ b/ext/posix/tests/posix_uname_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test posix_uname() function : error conditions +Test posix_uname() function : error conditions --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt index 05565efae32..28769da707e 100644 --- a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt @@ -14,7 +14,7 @@ var_dump($rc->getStartLine()); //Get the line number at the end of the definition of class C var_dump($rc->getEndLine()); -//Same tests as above but stdclass is internal - so all results should be false. +//Same tests as above but stdclass is internal - so all results should be false. $rc = new ReflectionClass("stdClass"); var_dump($rc->getFileName()); var_dump($rc->getStartLine()); diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt index 8edc6a93a65..31e0e8e58b9 100644 --- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt @@ -11,8 +11,8 @@ opcache.save_comments=1 My -Doc - * Comment +Doc + * Comment for A * */ @@ -63,8 +63,8 @@ string(%d) "/** My -Doc - * Comment +Doc + * Comment for A * */" diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt index 79009d3bdb6..b9eb0135222 100644 --- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt +++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt @@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net> <?php class pubf { public function f() {} - static public function s() {} + static public function s() {} } class subpubf extends pubf { } class protf { protected function f() {} - static protected function s() {} + static protected function s() {} } class subprotf extends protf { } @@ -26,7 +26,7 @@ class privf { class subprivf extends privf { } -$classes = array("pubf", "subpubf", "protf", "subprotf", +$classes = array("pubf", "subpubf", "protf", "subprotf", "privf", "subprivf"); foreach($classes as $class) { echo "Reflecting on class $class: \n"; diff --git a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt index 7d7e61335d9..9c656a38b61 100644 --- a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty"); $r4 = new ReflectionClass("Exception"); $r5 = new ReflectionClass("C"); -var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), +var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> --EXPECT-- diff --git a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt index 5babb546ae4..e9537c1e8a8 100644 --- a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty"); $r4 = new ReflectionClass("Exception"); $r5 = new ReflectionClass("C"); -var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), +var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> --EXPECT-- diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt index 2b7927e7ace..4c76959aecb 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ReflectionFunction::getClosure() function : basic functionality +Test ReflectionFunction::getClosure() function : basic functionality --FILE-- <?php /* Prototype : public mixed ReflectionFunction::getClosure() - * Description: Returns a dynamically created closure for the function + * Description: Returns a dynamically created closure for the function * Source code: ext/reflection/php_reflection.c * Alias to functions: */ diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt index f0a414d56b3..bf1bcf3603e 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ReflectionMethod::getClosure() function : basic functionality +Test ReflectionMethod::getClosure() function : basic functionality --FILE-- <?php /* Prototype : public mixed ReflectionFunction::getClosure() - * Description: Returns a dynamically created closure for the method + * Description: Returns a dynamically created closure for the method * Source code: ext/reflection/php_reflection.c * Alias to functions: */ diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt index e011f259b23..2544b0e7ec0 100644 --- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt @@ -44,7 +44,7 @@ class B extends A { private function privf() {} - /** My Doc Comment for B::protStatf + /** My Doc Comment for B::protStatf @@ -100,7 +100,7 @@ string(%d) "/** * ---> Doc comment for B::protStatf(): -string(%d) "/** My Doc Comment for B::protStatf +string(%d) "/** My Doc Comment for B::protStatf diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt index 623ba7b4804..70ad24297dd 100644 --- a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt +++ b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams +ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams --FILE-- <?php Class C { } diff --git a/ext/reflection/tests/ReflectionObject_export_basic3.phpt b/ext/reflection/tests/ReflectionObject_export_basic3.phpt index 7c1da34c930..dfd3f2e8037 100644 --- a/ext/reflection/tests/ReflectionObject_export_basic3.phpt +++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown. +ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown. --FILE-- <?php class C { diff --git a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt index 8a56c9f64eb..0ecbde7991b 100644 --- a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -ReflectionObject::getConstants() - basic function test +ReflectionObject::getConstants() - basic function test --FILE-- <?php class C { diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt index 167b6b0ff33..675bbdde8d8 100644 --- a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt +++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt @@ -57,7 +57,7 @@ $reflectionObjects = array( publicCtorNew::reflectionObjectFactory(), protectedCtorNew::reflectionObjectFactory(), privateCtorNew::reflectionObjectFactory(), - publicCtorOld::reflectionObjectFactory(), + publicCtorOld::reflectionObjectFactory(), protectedCtorOld::reflectionObjectFactory(), privateCtorOld::reflectionObjectFactory() ); diff --git a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt index 60a95dc8868..234b8eb27e1 100644 --- a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message')); $r4 = new ReflectionObject(new Exception); $r5 = new ReflectionObject(new C); -var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), +var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), $r4->isInternal(), $r5->isInternal()); ?> diff --git a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt index 390df504db1..1a9dea3aba8 100644 --- a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt +++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt @@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message')); $r4 = new ReflectionObject(new Exception); $r5 = new ReflectionObject(new C); -var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), +var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), $r4->isUserDefined(), $r5->isUserDefined()); ?> diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt index e2ff294261c..a297a104368 100644 --- a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt +++ b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt @@ -23,7 +23,7 @@ class TestClass public $pub; static public $stat = "static property"; /** - * This property has a comment. + * This property has a comment. */ protected $prot = 4; private $priv = "keepOut"; diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt index 7edf06474cc..0b147aa8112 100644 --- a/ext/reflection/tests/bug42976.phpt +++ b/ext/reflection/tests/bug42976.phpt @@ -18,7 +18,7 @@ $x = "x.original"; $rc->newInstance($x); // causes crash var_dump($x); $x = "x.original"; -$rc->newInstanceArgs(array($x)); // causes crash +$rc->newInstanceArgs(array($x)); // causes crash var_dump($x); echo "Done\n"; diff --git a/ext/reflection/tests/bug66430.phpt b/ext/reflection/tests/bug66430.phpt index 6e35a0389ec..921e2c99d8e 100644 --- a/ext/reflection/tests/bug66430.phpt +++ b/ext/reflection/tests/bug66430.phpt @@ -5,7 +5,7 @@ Bug #66430: ReflectionFunction::invoke does not invoke closure with object scope class Alpha { public $message = "Valid representation"; - + public function bravo() { return $this->message; } diff --git a/ext/session/tests/bug69111.phpt b/ext/session/tests/bug69111.phpt index ce14dc750c6..c7a6cada651 100644 --- a/ext/session/tests/bug69111.phpt +++ b/ext/session/tests/bug69111.phpt @@ -10,7 +10,7 @@ session_set_save_handler($sh); $savePath = ini_get('session.save_path'); $sessionName = ini_get('session.name'); -// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data. +// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data. $sh->open($savePath, $sessionName); $sh->write("foo", "bar"); diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt index e6e274e03c5..078d69d837e 100644 --- a/ext/session/tests/session_cache_expire_basic.phpt +++ b/ext/session/tests/session_cache_expire_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_expire() : basic functionality ***\n"; diff --git a/ext/session/tests/session_cache_expire_error.phpt b/ext/session/tests/session_cache_expire_error.phpt index 19324e2c5b6..4a335e7f677 100644 --- a/ext/session/tests/session_cache_expire_error.phpt +++ b/ext/session/tests/session_cache_expire_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_expire() : error functionality ***\n"; diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt index 78e101bb0e0..0884614a4da 100644 --- a/ext/session/tests/session_cache_expire_variation1.phpt +++ b/ext/session/tests/session_cache_expire_variation1.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_expire() : variation ***\n"; diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt index 4f827f1207a..586a6ec0238 100644 --- a/ext/session/tests/session_cache_expire_variation2.phpt +++ b/ext/session/tests/session_cache_expire_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_expire() : variation ***\n"; diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt index 04649a13bc0..b9d29b4070e 100644 --- a/ext/session/tests/session_cache_expire_variation3.phpt +++ b/ext/session/tests/session_cache_expire_variation3.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : int session_cache_expire([int $new_cache_expire]) * Description : Return current cache expire - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_expire() : variation ***\n"; diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt index 121a634c59d..39b5fcd5f1f 100644 --- a/ext/session/tests/session_cache_limiter_basic.phpt +++ b/ext/session/tests/session_cache_limiter_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_limiter() : basic functionality ***\n"; diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt index f2805b9eab8..b5bd42fdad2 100644 --- a/ext/session/tests/session_cache_limiter_error.phpt +++ b/ext/session/tests/session_cache_limiter_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_limiter() : error functionality ***\n"; diff --git a/ext/session/tests/session_cache_limiter_variation1.phpt b/ext/session/tests/session_cache_limiter_variation1.phpt index 892383a4fdd..ce9b011d264 100644 --- a/ext/session/tests/session_cache_limiter_variation1.phpt +++ b/ext/session/tests/session_cache_limiter_variation1.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_limiter() : variation ***\n"; diff --git a/ext/session/tests/session_cache_limiter_variation2.phpt b/ext/session/tests/session_cache_limiter_variation2.phpt index 64cc20c1845..58dc5da6c49 100644 --- a/ext/session/tests/session_cache_limiter_variation2.phpt +++ b/ext/session/tests/session_cache_limiter_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_limiter() : variation ***\n"; diff --git a/ext/session/tests/session_cache_limiter_variation3.phpt b/ext/session/tests/session_cache_limiter_variation3.phpt index 65c6b26699e..a55648a8511 100644 --- a/ext/session/tests/session_cache_limiter_variation3.phpt +++ b/ext/session/tests/session_cache_limiter_variation3.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_cache_limiter([string $cache_limiter]) * Description : Get and/or set the current cache limiter - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_cache_limiter() : variation ***\n"; diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt index 4e4fde0b882..1537af4abb7 100644 --- a/ext/session/tests/session_commit_basic.phpt +++ b/ext/session/tests/session_commit_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_commit(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_commit() : basic functionality ***\n"; diff --git a/ext/session/tests/session_commit_error.phpt b/ext/session/tests/session_commit_error.phpt index a035332dff0..c71cee34ebe 100644 --- a/ext/session/tests/session_commit_error.phpt +++ b/ext/session/tests/session_commit_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_commit(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_commit() : error functionality ***\n"; diff --git a/ext/session/tests/session_commit_variation1.phpt b/ext/session/tests/session_commit_variation1.phpt index 0cdcc27983b..cce0756d62b 100644 --- a/ext/session/tests/session_commit_variation1.phpt +++ b/ext/session/tests/session_commit_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_commit(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_commit() : variation ***\n"; diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt index 4bc0c62395f..c2ebc5235af 100644 --- a/ext/session/tests/session_commit_variation2.phpt +++ b/ext/session/tests/session_commit_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_commit(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_commit() : variation ***\n"; diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt index 8d9db6c94c1..94f11d4f121 100644 --- a/ext/session/tests/session_commit_variation3.phpt +++ b/ext/session/tests/session_commit_variation3.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_commit(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_commit() : variation ***\n"; diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt index dfffe74877c..2cb3f1c9624 100644 --- a/ext/session/tests/session_decode_basic.phpt +++ b/ext/session/tests/session_decode_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : basic functionality ***\n"; diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt index 59ebe5d4197..f9426c7ff78 100644 --- a/ext/session/tests/session_decode_basic_serialize.phpt +++ b/ext/session/tests/session_decode_basic_serialize.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : basic functionality ***\n"; diff --git a/ext/session/tests/session_decode_error.phpt b/ext/session/tests/session_decode_error.phpt index b6d45063a19..72bc25976b0 100644 --- a/ext/session/tests/session_decode_error.phpt +++ b/ext/session/tests/session_decode_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : error functionality ***\n"; diff --git a/ext/session/tests/session_decode_error2.phpt b/ext/session/tests/session_decode_error2.phpt index 3631613efcb..ff4e618a5ec 100644 --- a/ext/session/tests/session_decode_error2.phpt +++ b/ext/session/tests/session_decode_error2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : error functionality ***\n"; diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt index 94c5bf873e0..d9a498d2e98 100644 --- a/ext/session/tests/session_decode_variation1.phpt +++ b/ext/session/tests/session_decode_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : variation ***\n"; diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt index 6e483310599..a3cca07866c 100644 --- a/ext/session/tests/session_decode_variation2.phpt +++ b/ext/session/tests/session_decode_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : variation ***\n"; diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt index 7322dc07621..a50feb0cf00 100644 --- a/ext/session/tests/session_decode_variation3.phpt +++ b/ext/session/tests/session_decode_variation3.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : variation ***\n"; diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt index 48247d92f57..9f9d6b36376 100644 --- a/ext/session/tests/session_decode_variation4.phpt +++ b/ext/session/tests/session_decode_variation4.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_decode(void) * Description : Decodes session data from a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_decode() : variation ***\n"; diff --git a/ext/session/tests/session_destroy_error.phpt b/ext/session/tests/session_destroy_error.phpt index ad50593bc30..a03face43d9 100644 --- a/ext/session/tests/session_destroy_error.phpt +++ b/ext/session/tests/session_destroy_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_destroy() : error functionality ***\n"; diff --git a/ext/session/tests/session_destroy_variation1.phpt b/ext/session/tests/session_destroy_variation1.phpt index aa4a9326620..bb3de056c04 100644 --- a/ext/session/tests/session_destroy_variation1.phpt +++ b/ext/session/tests/session_destroy_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_destroy() : variation ***\n"; diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt index 0a11ea2caff..daaa5801400 100644 --- a/ext/session/tests/session_destroy_variation2.phpt +++ b/ext/session/tests/session_destroy_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_destroy() : variation ***\n"; diff --git a/ext/session/tests/session_destroy_variation3.phpt b/ext/session/tests/session_destroy_variation3.phpt index 45933854011..f53d0420bdb 100644 --- a/ext/session/tests/session_destroy_variation3.phpt +++ b/ext/session/tests/session_destroy_variation3.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_destroy(void) * Description : Destroys all data registered to a session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_destroy() : variation ***\n"; diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt index 63ed1937ac5..de2a9c97ee8 100644 --- a/ext/session/tests/session_encode_basic.phpt +++ b/ext/session/tests/session_encode_basic.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : basic functionality ***\n"; diff --git a/ext/session/tests/session_encode_error.phpt b/ext/session/tests/session_encode_error.phpt index 6bf72d6237e..54693963f1d 100644 --- a/ext/session/tests/session_encode_error.phpt +++ b/ext/session/tests/session_encode_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : basic functionality ***\n"; diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt index 17666aedda9..1a87eb14a31 100644 --- a/ext/session/tests/session_encode_error2.phpt +++ b/ext/session/tests/session_encode_error2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : error functionality ***\n"; diff --git a/ext/session/tests/session_encode_variation1.phpt b/ext/session/tests/session_encode_variation1.phpt index 71b520e0baf..cff175c1d1e 100644 --- a/ext/session/tests/session_encode_variation1.phpt +++ b/ext/session/tests/session_encode_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation2.phpt b/ext/session/tests/session_encode_variation2.phpt index 34e1a5cfa68..a6d7331784e 100644 --- a/ext/session/tests/session_encode_variation2.phpt +++ b/ext/session/tests/session_encode_variation2.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt index 353fd7b205c..c85a9b120de 100644 --- a/ext/session/tests/session_encode_variation3.phpt +++ b/ext/session/tests/session_encode_variation3.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt index 4a818d71d1a..4d03f92ad5d 100644 --- a/ext/session/tests/session_encode_variation4.phpt +++ b/ext/session/tests/session_encode_variation4.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt index 01340816946..c923ab40595 100644 --- a/ext/session/tests/session_encode_variation5.phpt +++ b/ext/session/tests/session_encode_variation5.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation6.phpt b/ext/session/tests/session_encode_variation6.phpt index e99d1b5a493..4c3f0370fa4 100644 --- a/ext/session/tests/session_encode_variation6.phpt +++ b/ext/session/tests/session_encode_variation6.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt index 6c592165b8e..85e9aa50b89 100644 --- a/ext/session/tests/session_encode_variation7.phpt +++ b/ext/session/tests/session_encode_variation7.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_encode_variation8.phpt b/ext/session/tests/session_encode_variation8.phpt index 1a93ae92f21..c84152cd13c 100644 --- a/ext/session/tests/session_encode_variation8.phpt +++ b/ext/session/tests/session_encode_variation8.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_encode(void) * Description : Encodes the current session data as a string - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_encode() : variation ***\n"; diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt index 9af2103d7c5..cd41ce85eff 100644 --- a/ext/session/tests/session_get_cookie_params_basic.phpt +++ b/ext/session/tests/session_get_cookie_params_basic.phpt @@ -17,7 +17,7 @@ ob_start(); /* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_get_cookie_params() : basic functionality ***\n"; diff --git a/ext/session/tests/session_get_cookie_params_error.phpt b/ext/session/tests/session_get_cookie_params_error.phpt index 56c4a220cdc..0cf54efb029 100644 --- a/ext/session/tests/session_get_cookie_params_error.phpt +++ b/ext/session/tests/session_get_cookie_params_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_get_cookie_params() : error functionality ***\n"; diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt index d4c35e20b06..85b05e34c2f 100644 --- a/ext/session/tests/session_get_cookie_params_variation1.phpt +++ b/ext/session/tests/session_get_cookie_params_variation1.phpt @@ -17,7 +17,7 @@ ob_start(); /* * Prototype : array session_get_cookie_params(void) * Description : Get the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_get_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt index 55cbf2c97f3..7c3e465cb2e 100644 --- a/ext/session/tests/session_id_basic.phpt +++ b/ext/session/tests/session_id_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_id() : basic functionality ***\n"; diff --git a/ext/session/tests/session_id_basic2.phpt b/ext/session/tests/session_id_basic2.phpt index bc38f4035df..5b6acb12517 100644 --- a/ext/session/tests/session_id_basic2.phpt +++ b/ext/session/tests/session_id_basic2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_id() : basic functionality ***\n"; diff --git a/ext/session/tests/session_id_error.phpt b/ext/session/tests/session_id_error.phpt index 83b0737eab2..651092c01be 100644 --- a/ext/session/tests/session_id_error.phpt +++ b/ext/session/tests/session_id_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_id([string $id]) * Description : Get and/or set the current session id - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_id() : error functionality ***\n"; diff --git a/ext/session/tests/session_module_name_basic.phpt b/ext/session/tests/session_module_name_basic.phpt index 2695eb6230d..8d8bf70573b 100644 --- a/ext/session/tests/session_module_name_basic.phpt +++ b/ext/session/tests/session_module_name_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : basic functionality ***\n"; diff --git a/ext/session/tests/session_module_name_error.phpt b/ext/session/tests/session_module_name_error.phpt index e560dc4f2de..6940445969f 100644 --- a/ext/session/tests/session_module_name_error.phpt +++ b/ext/session/tests/session_module_name_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : error functionality ***\n"; diff --git a/ext/session/tests/session_module_name_variation1.phpt b/ext/session/tests/session_module_name_variation1.phpt index a3a163ef55d..59d9112a553 100644 --- a/ext/session/tests/session_module_name_variation1.phpt +++ b/ext/session/tests/session_module_name_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : variation ***\n"; diff --git a/ext/session/tests/session_module_name_variation2.phpt b/ext/session/tests/session_module_name_variation2.phpt index c3945b4d2ec..b14c0c2aac0 100644 --- a/ext/session/tests/session_module_name_variation2.phpt +++ b/ext/session/tests/session_module_name_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : variation ***\n"; diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt index 5c6d792eb6a..b03173cecfa 100644 --- a/ext/session/tests/session_module_name_variation3.phpt +++ b/ext/session/tests/session_module_name_variation3.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : variation ***\n"; diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt index bcf0204f956..132b94d658b 100644 --- a/ext/session/tests/session_module_name_variation4.phpt +++ b/ext/session/tests/session_module_name_variation4.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : string session_module_name([string $module]) * Description : Get and/or set the current session module - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_module_name() : variation ***\n"; diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt index ee3435b5d3b..3d373ed5e0a 100644 --- a/ext/session/tests/session_name_basic.phpt +++ b/ext/session/tests/session_name_basic.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_name() : error functionality ***\n"; diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt index 2ad83642b77..2d1f656b1d3 100644 --- a/ext/session/tests/session_name_error.phpt +++ b/ext/session/tests/session_name_error.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_name() : error functionality ***\n"; diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt index a417df9902e..901a472e3c9 100644 --- a/ext/session/tests/session_name_variation1.phpt +++ b/ext/session/tests/session_name_variation1.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_name() : variation ***\n"; diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt index 2f9538a8cf3..eb22248e18c 100644 --- a/ext/session/tests/session_name_variation2.phpt +++ b/ext/session/tests/session_name_variation2.phpt @@ -3,7 +3,7 @@ Test session_name() function : variation --SKIPIF-- <?php include('skipif.inc'); ?> --INI-- -session.name=blah +session.name=blah --FILE-- <?php @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : string session_name([string $name]) * Description : Get and/or set the current session name - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_name() : variation ***\n"; diff --git a/ext/session/tests/session_regenerate_id_basic.phpt b/ext/session/tests/session_regenerate_id_basic.phpt index 1f45008493b..7121500db1a 100644 --- a/ext/session/tests/session_regenerate_id_basic.phpt +++ b/ext/session/tests/session_regenerate_id_basic.phpt @@ -9,8 +9,8 @@ ob_start(); /* * Prototype : bool session_regenerate_id([bool $delete_old_session]) - * Description : Update the current session id with a newly generated one - * Source code : ext/session/session.c + * Description : Update the current session id with a newly generated one + * Source code : ext/session/session.c */ echo "*** Testing session_regenerate_id() : basic functionality ***\n"; diff --git a/ext/session/tests/session_regenerate_id_error.phpt b/ext/session/tests/session_regenerate_id_error.phpt index 74e82ef1d23..a9a66c17e60 100644 --- a/ext/session/tests/session_regenerate_id_error.phpt +++ b/ext/session/tests/session_regenerate_id_error.phpt @@ -9,8 +9,8 @@ ob_start(); /* * Prototype : bool session_regenerate_id([bool $delete_old_session]) - * Description : Update the current session id with a newly generated one - * Source code : ext/session/session.c + * Description : Update the current session id with a newly generated one + * Source code : ext/session/session.c */ echo "*** Testing session_regenerate_id() : error functionality ***\n"; diff --git a/ext/session/tests/session_regenerate_id_variation1.phpt b/ext/session/tests/session_regenerate_id_variation1.phpt index 2a9b0b29973..a5670341afc 100644 --- a/ext/session/tests/session_regenerate_id_variation1.phpt +++ b/ext/session/tests/session_regenerate_id_variation1.phpt @@ -9,8 +9,8 @@ ob_start(); /* * Prototype : bool session_regenerate_id([bool $delete_old_session]) - * Description : Update the current session id with a newly generated one - * Source code : ext/session/session.c + * Description : Update the current session id with a newly generated one + * Source code : ext/session/session.c */ echo "*** Testing session_regenerate_id() : variation ***\n"; diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt index a7ff0d76559..08acf5a3f5d 100644 --- a/ext/session/tests/session_save_path_basic.phpt +++ b/ext/session/tests/session_save_path_basic.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : error functionality ***\n"; diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt index e3b5fedad08..809f0a73209 100644 --- a/ext/session/tests/session_save_path_error.phpt +++ b/ext/session/tests/session_save_path_error.phpt @@ -15,7 +15,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : error functionality ***\n"; diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt index e5f776ea76a..b8fb86509f3 100644 --- a/ext/session/tests/session_save_path_variation2.phpt +++ b/ext/session/tests/session_save_path_variation2.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : variation ***\n"; diff --git a/ext/session/tests/session_save_path_variation3.phpt b/ext/session/tests/session_save_path_variation3.phpt index 0cfb2edd621..e369b12e0a6 100644 --- a/ext/session/tests/session_save_path_variation3.phpt +++ b/ext/session/tests/session_save_path_variation3.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : variation ***\n"; diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt index 7bd65cff8f0..1cb86e1c308 100644 --- a/ext/session/tests/session_save_path_variation4.phpt +++ b/ext/session/tests/session_save_path_variation4.phpt @@ -15,7 +15,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : variation ***\n"; diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index e36bbfc0b1a..1dd86f8afa9 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -16,7 +16,7 @@ ob_start(); /* * Prototype : string session_save_path([string $path]) * Description : Get and/or set the current session save path - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_save_path() : variation ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_basic.phpt b/ext/session/tests/session_set_cookie_params_basic.phpt index f0a25212bd9..e40c4e77b70 100644 --- a/ext/session/tests/session_set_cookie_params_basic.phpt +++ b/ext/session/tests/session_set_cookie_params_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : basic functionality ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_error.phpt b/ext/session/tests/session_set_cookie_params_error.phpt index ad99271bd01..518c5abf89e 100644 --- a/ext/session/tests/session_set_cookie_params_error.phpt +++ b/ext/session/tests/session_set_cookie_params_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : error functionality ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_variation1.phpt b/ext/session/tests/session_set_cookie_params_variation1.phpt index 67c6698678a..46ec780e9de 100644 --- a/ext/session/tests/session_set_cookie_params_variation1.phpt +++ b/ext/session/tests/session_set_cookie_params_variation1.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_variation2.phpt b/ext/session/tests/session_set_cookie_params_variation2.phpt index 8d10c9317b5..07bb5cfdf52 100644 --- a/ext/session/tests/session_set_cookie_params_variation2.phpt +++ b/ext/session/tests/session_set_cookie_params_variation2.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_variation3.phpt b/ext/session/tests/session_set_cookie_params_variation3.phpt index 27dc8b2c0ae..5a4e2df8fd7 100644 --- a/ext/session/tests/session_set_cookie_params_variation3.phpt +++ b/ext/session/tests/session_set_cookie_params_variation3.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_variation4.phpt b/ext/session/tests/session_set_cookie_params_variation4.phpt index 5d40237e438..ab0de3bd8b7 100644 --- a/ext/session/tests/session_set_cookie_params_variation4.phpt +++ b/ext/session/tests/session_set_cookie_params_variation4.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_set_cookie_params_variation5.phpt b/ext/session/tests/session_set_cookie_params_variation5.phpt index 43412316ec4..f630a5ff4a3 100644 --- a/ext/session/tests/session_set_cookie_params_variation5.phpt +++ b/ext/session/tests/session_set_cookie_params_variation5.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]]) * Description : Set the session cookie parameters - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_cookie_params() : variation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt index c1b473da8b2..bf77e77a6e3 100644 --- a/ext/session/tests/session_set_save_handler_basic.phpt +++ b/ext/session/tests/session_set_save_handler_basic.phpt @@ -15,7 +15,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : basic functionality ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt index d39a4c4c0eb..94ab5f8247a 100644 --- a/ext/session/tests/session_set_save_handler_class_001.phpt +++ b/ext/session/tests/session_set_save_handler_class_001.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : basic class wrapping existing handler ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt index c777242e1c0..fe343766735 100644 --- a/ext/session/tests/session_set_save_handler_class_002.phpt +++ b/ext/session/tests/session_set_save_handler_class_002.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : full handler implementation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt index ee54a90d0f4..b6b179913a6 100644 --- a/ext/session/tests/session_set_save_handler_class_003.phpt +++ b/ext/session/tests/session_set_save_handler_class_003.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : inheritance ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt index 650bc8456c2..71ebff2ecaf 100644 --- a/ext/session/tests/session_set_save_handler_class_004.phpt +++ b/ext/session/tests/session_set_save_handler_class_004.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : default object ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt index 2f98d2f17ff..e788ad11979 100644 --- a/ext/session/tests/session_set_save_handler_class_005.phpt +++ b/ext/session/tests/session_set_save_handler_class_005.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : incomplete implementation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_006.phpt b/ext/session/tests/session_set_save_handler_class_006.phpt index 921a1c70a5b..3f86437207a 100644 --- a/ext/session/tests/session_set_save_handler_class_006.phpt +++ b/ext/session/tests/session_set_save_handler_class_006.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : using objects in close ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_007.phpt b/ext/session/tests/session_set_save_handler_class_007.phpt index 3dd97847d74..0416a894c66 100644 --- a/ext/session/tests/session_set_save_handler_class_007.phpt +++ b/ext/session/tests/session_set_save_handler_class_007.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : manual shutdown, reopen ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_008.phpt b/ext/session/tests/session_set_save_handler_class_008.phpt index 6093efb83d7..da9611a8c71 100644 --- a/ext/session/tests/session_set_save_handler_class_008.phpt +++ b/ext/session/tests/session_set_save_handler_class_008.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : manual shutdown ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_009.phpt b/ext/session/tests/session_set_save_handler_class_009.phpt index 5cc4db506e8..d878450540e 100644 --- a/ext/session/tests/session_set_save_handler_class_009.phpt +++ b/ext/session/tests/session_set_save_handler_class_009.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : implicit shutdown ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_010.phpt b/ext/session/tests/session_set_save_handler_class_010.phpt index 76d390b63a6..2424a08d68d 100644 --- a/ext/session/tests/session_set_save_handler_class_010.phpt +++ b/ext/session/tests/session_set_save_handler_class_010.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : manual shutdown function ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_011.phpt b/ext/session/tests/session_set_save_handler_class_011.phpt index 88321ef9dcc..05a84a359a6 100644 --- a/ext/session/tests/session_set_save_handler_class_011.phpt +++ b/ext/session/tests/session_set_save_handler_class_011.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : shutdown failure ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index bd7badd8109..c901385edb3 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : incorrect arguments for existing handler open ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt index fa35e0e6e41..c882e902049 100644 --- a/ext/session/tests/session_set_save_handler_class_013.phpt +++ b/ext/session/tests/session_set_save_handler_class_013.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : incorrect arguments for existing handler close ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt index a3847a8f581..6f8839aad8b 100644 --- a/ext/session/tests/session_set_save_handler_class_014.phpt +++ b/ext/session/tests/session_set_save_handler_class_014.phpt @@ -16,7 +16,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : calling default handler when save_handler=user ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt index 7458f272513..2fabf79fcd0 100644 --- a/ext/session/tests/session_set_save_handler_class_015.phpt +++ b/ext/session/tests/session_set_save_handler_class_015.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : register session handler but don't start ***\n"; diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt index 8840b0a633d..720541f3fcc 100644 --- a/ext/session/tests/session_set_save_handler_class_017.phpt +++ b/ext/session/tests/session_set_save_handler_class_017.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() function: class with create_sid ***\n"; diff --git a/ext/session/tests/session_set_save_handler_closures.phpt b/ext/session/tests/session_set_save_handler_closures.phpt index f790b888229..77bbf6caff5 100644 --- a/ext/session/tests/session_set_save_handler_closures.phpt +++ b/ext/session/tests/session_set_save_handler_closures.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : using closures as callbacks ***\n"; diff --git a/ext/session/tests/session_set_save_handler_error.phpt b/ext/session/tests/session_set_save_handler_error.phpt index 0362ddc8dd1..2249d1e5a27 100644 --- a/ext/session/tests/session_set_save_handler_error.phpt +++ b/ext/session/tests/session_set_save_handler_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : error functionality ***\n"; diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt index eb2ac8c99d7..4679f879013 100644 --- a/ext/session/tests/session_set_save_handler_error2.phpt +++ b/ext/session/tests/session_set_save_handler_error2.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : error functionality ***\n"; diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt index 451544bb90e..ecb5e5a91df 100644 --- a/ext/session/tests/session_set_save_handler_error3.phpt +++ b/ext/session/tests/session_set_save_handler_error3.phpt @@ -14,7 +14,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : error functionality ***\n"; diff --git a/ext/session/tests/session_set_save_handler_error4.phpt b/ext/session/tests/session_set_save_handler_error4.phpt index 7d43333d6d7..00fb2976e36 100644 --- a/ext/session/tests/session_set_save_handler_error4.phpt +++ b/ext/session/tests/session_set_save_handler_error4.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : error functionality ***\n"; diff --git a/ext/session/tests/session_set_save_handler_iface_001.phpt b/ext/session/tests/session_set_save_handler_iface_001.phpt index e2424ba9b80..bfc9e2fa82a 100644 --- a/ext/session/tests/session_set_save_handler_iface_001.phpt +++ b/ext/session/tests/session_set_save_handler_iface_001.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() function: interface ***\n"; diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt index 56943c8f529..0000c50add7 100644 --- a/ext/session/tests/session_set_save_handler_iface_002.phpt +++ b/ext/session/tests/session_set_save_handler_iface_002.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() function: interface wrong ***\n"; diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt index 1e7889ec48e..9e0ce336168 100644 --- a/ext/session/tests/session_set_save_handler_iface_003.phpt +++ b/ext/session/tests/session_set_save_handler_iface_003.phpt @@ -13,7 +13,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true]) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() function: id interface ***\n"; diff --git a/ext/session/tests/session_set_save_handler_variation1.phpt b/ext/session/tests/session_set_save_handler_variation1.phpt index 1a4363d87b8..3362adbac53 100644 --- a/ext/session/tests/session_set_save_handler_variation1.phpt +++ b/ext/session/tests/session_set_save_handler_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : variation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt index 93f2dbe04b4..1e8a8f51c14 100644 --- a/ext/session/tests/session_set_save_handler_variation2.phpt +++ b/ext/session/tests/session_set_save_handler_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : variation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_variation3.phpt b/ext/session/tests/session_set_save_handler_variation3.phpt index f4caa37d024..9af87dd1700 100644 --- a/ext/session/tests/session_set_save_handler_variation3.phpt +++ b/ext/session/tests/session_set_save_handler_variation3.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : variation ***\n"; diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt index ca82d9e28e1..d0903b2ffcb 100644 --- a/ext/session/tests/session_set_save_handler_variation4.phpt +++ b/ext/session/tests/session_set_save_handler_variation4.phpt @@ -17,7 +17,7 @@ ob_start(); /* * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc) * Description : Sets user-level session storage functions - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_set_save_handler() : variation ***\n"; diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt index bd848faca19..c81a7d2fdea 100644 --- a/ext/session/tests/session_start_error.phpt +++ b/ext/session/tests/session_start_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : error functionality ***\n"; diff --git a/ext/session/tests/session_start_variation1.phpt b/ext/session/tests/session_start_variation1.phpt index b184cb6d22f..d76bd8b0f3c 100644 --- a/ext/session/tests/session_start_variation1.phpt +++ b/ext/session/tests/session_start_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt index 516b98d2982..9af8d383081 100644 --- a/ext/session/tests/session_start_variation2.phpt +++ b/ext/session/tests/session_start_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation3.phpt b/ext/session/tests/session_start_variation3.phpt index 576c2953977..8f0b56306fe 100644 --- a/ext/session/tests/session_start_variation3.phpt +++ b/ext/session/tests/session_start_variation3.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt index c2aaeaf8864..9f6ffa59726 100644 --- a/ext/session/tests/session_start_variation4.phpt +++ b/ext/session/tests/session_start_variation4.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt index d3b702f7337..a8eeb25f83d 100644 --- a/ext/session/tests/session_start_variation5.phpt +++ b/ext/session/tests/session_start_variation5.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt index a6aaf3a035c..3a9b2e24fee 100644 --- a/ext/session/tests/session_start_variation6.phpt +++ b/ext/session/tests/session_start_variation6.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt index 36a9ecdf2f1..8e010f8182d 100644 --- a/ext/session/tests/session_start_variation7.phpt +++ b/ext/session/tests/session_start_variation7.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation8.phpt b/ext/session/tests/session_start_variation8.phpt index 155aa647f37..f37e1bf15f9 100644 --- a/ext/session/tests/session_start_variation8.phpt +++ b/ext/session/tests/session_start_variation8.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_start_variation9.phpt b/ext/session/tests/session_start_variation9.phpt index 91bf794c94f..e37c484ee0c 100644 --- a/ext/session/tests/session_start_variation9.phpt +++ b/ext/session/tests/session_start_variation9.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_start(void) * Description : Initialize session data - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_start() : variation ***\n"; diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt index 95c2812a93d..bdd03191355 100644 --- a/ext/session/tests/session_unset_basic.phpt +++ b/ext/session/tests/session_unset_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : void session_unset(void) * Description : Free all session variables - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_unset() : basic functionality ***\n"; diff --git a/ext/session/tests/session_unset_error.phpt b/ext/session/tests/session_unset_error.phpt index 656171dad37..c411cffa469 100644 --- a/ext/session/tests/session_unset_error.phpt +++ b/ext/session/tests/session_unset_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : void session_unset(void) * Description : Free all session variables - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_unset() : error functionality ***\n"; diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt index baa6a634ae1..7c69dfd8f7b 100644 --- a/ext/session/tests/session_unset_variation1.phpt +++ b/ext/session/tests/session_unset_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : void session_unset(void) * Description : Free all session variables - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_unset() : variation ***\n"; diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt index 16120e5827a..6b734d12bfd 100644 --- a/ext/session/tests/session_write_close_basic.phpt +++ b/ext/session/tests/session_write_close_basic.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : basic functionality ***\n"; diff --git a/ext/session/tests/session_write_close_error.phpt b/ext/session/tests/session_write_close_error.phpt index d5ff20d8058..5e48d8c0008 100644 --- a/ext/session/tests/session_write_close_error.phpt +++ b/ext/session/tests/session_write_close_error.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : error functionality ***\n"; diff --git a/ext/session/tests/session_write_close_variation1.phpt b/ext/session/tests/session_write_close_variation1.phpt index 96e34b87ceb..bd849f78d0e 100644 --- a/ext/session/tests/session_write_close_variation1.phpt +++ b/ext/session/tests/session_write_close_variation1.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : variation ***\n"; diff --git a/ext/session/tests/session_write_close_variation2.phpt b/ext/session/tests/session_write_close_variation2.phpt index 1768b9365f4..fc1abf833fd 100644 --- a/ext/session/tests/session_write_close_variation2.phpt +++ b/ext/session/tests/session_write_close_variation2.phpt @@ -10,7 +10,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : variation ***\n"; diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt index 9d685ad144e..b200d14af18 100644 --- a/ext/session/tests/session_write_close_variation3.phpt +++ b/ext/session/tests/session_write_close_variation3.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : variation ***\n"; diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt index 2da41ca38ea..aa6bd85a129 100644 --- a/ext/session/tests/session_write_close_variation4.phpt +++ b/ext/session/tests/session_write_close_variation4.phpt @@ -12,7 +12,7 @@ ob_start(); /* * Prototype : bool session_write_close(void) * Description : Write session data and end session - * Source code : ext/session/session.c + * Source code : ext/session/session.c */ echo "*** Testing session_write_close() : variation ***\n"; diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt index f0c32d4e55e..dba2df58c79 100644 --- a/ext/simplexml/tests/008.phpt +++ b/ext/simplexml/tests/008.phpt @@ -1,5 +1,5 @@ --TEST-- -SimpleXML: XPath +SimpleXML: XPath --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- @@ -25,9 +25,9 @@ EOF; $sxe = simplexml_load_string($xml); var_dump($sxe->xpath("elem1/elem2/elem3/elem4")); -//valid expression +//valid expression var_dump($sxe->xpath("***")); -//invalid expression +//invalid expression var_dump($sxe->xpath("**")); ?> --EXPECTF-- diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt index 096d8391e8b..2800f3add95 100644 --- a/ext/simplexml/tests/009.phpt +++ b/ext/simplexml/tests/009.phpt @@ -1,5 +1,5 @@ --TEST-- -SimpleXML: foreach +SimpleXML: foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt index e042875ce3a..fd920e2e265 100644 --- a/ext/simplexml/tests/009b.phpt +++ b/ext/simplexml/tests/009b.phpt @@ -1,5 +1,5 @@ --TEST-- -SimpleXML: foreach +SimpleXML: foreach --SKIPIF-- <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt index 61b6316e6d5..59d14b09c07 100644 --- a/ext/simplexml/tests/bug46047.phpt +++ b/ext/simplexml/tests/bug46047.phpt @@ -4,7 +4,7 @@ Bug #46047 (SimpleXML converts empty nodes into object with nested array) <?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- <?php -$xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>', +$xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>', LIBXML_NOCDATA); print_r($xml); diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt index b78a1f784e3..2239f9fddc9 100644 --- a/ext/snmp/tests/snmp3-error.phpt +++ b/ext/snmp/tests/snmp3-error.phpt @@ -12,8 +12,8 @@ require_once(dirname(__FILE__).'/snmp_include.inc'); echo "Checking error handling\n"; -//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, -// string auth_passphrase, string priv_protocol, string priv_passphrase, +//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, +// string auth_passphrase, string priv_protocol, string priv_passphrase, // string object_id [, int timeout [, int retries]]); var_dump(snmp3_get($hostname, $community, '', '', '', '', '')); diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt index f4177b95626..57ea4539382 100644 --- a/ext/snmp/tests/snmp3.phpt +++ b/ext/snmp/tests/snmp3.phpt @@ -10,8 +10,8 @@ require_once(dirname(__FILE__).'/skipif.inc'); <?php require_once(dirname(__FILE__).'/snmp_include.inc'); -//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, -// string auth_passphrase, string priv_protocol, string priv_passphrase, +//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, +// string auth_passphrase, string priv_protocol, string priv_passphrase, // string object_id [, int timeout [, int retries]]); echo "Working version\n"; diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt index dd8c3a162c6..56c55382231 100644 --- a/ext/soap/tests/bugs/bug28969.phpt +++ b/ext/soap/tests/bugs/bug28969.phpt @@ -27,9 +27,9 @@ class LocalSoapClient extends SoapClient { } -$x = new LocalSoapClient(NULL,array('location'=>'test://', +$x = new LocalSoapClient(NULL,array('location'=>'test://', 'uri'=>'http://testuri.org', - 'encoding'=>'ISO-8859-1')); + 'encoding'=>'ISO-8859-1')); var_dump($x->test()); echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt index 94c1aa954b7..2e523030a96 100644 --- a/ext/soap/tests/bugs/bug35142.phpt +++ b/ext/soap/tests/bugs/bug35142.phpt @@ -32,7 +32,7 @@ class TestSoapClient extends SoapClient { } -$soapClient = new TestSoapClient($wsdl, +$soapClient = new TestSoapClient($wsdl, array('trace' => 1, 'exceptions' => 0, 'classmap' => array('logOnEvent' => 'LogOnEvent', 'logOffEvent' => 'LogOffEvent', diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt index 8c01c5b5d3f..1e398c0c2cd 100644 --- a/ext/soap/tests/bugs/bug36226.phpt +++ b/ext/soap/tests/bugs/bug36226.phpt @@ -32,7 +32,7 @@ class TestSoapClient extends SoapClient { } -$soapClient = new TestSoapClient($wsdl, +$soapClient = new TestSoapClient($wsdl, array('trace' => 1, 'exceptions' => 0, 'classmap' => array('logOnEvent' => 'LogOnEvent', 'logOffEvent' => 'LogOffEvent', diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt index 219696c263e..65578672777 100644 --- a/ext/soap/tests/bugs/bug38005.phpt +++ b/ext/soap/tests/bugs/bug38005.phpt @@ -31,7 +31,7 @@ $client = new TestSoapClient(NULL, array( 'uri' => "test://", 'location' => "test://", 'soap_version'=>SOAP_1_2, - 'trace'=>1, + 'trace'=>1, 'exceptions'=>0)); $res = $client->Test(); echo($res->faultstring."\n"); diff --git a/ext/soap/tests/bugs/bug43045.phpt b/ext/soap/tests/bugs/bug43045.phpt index a32acfe0ead..f4f3983800a 100644 --- a/ext/soap/tests/bugs/bug43045.phpt +++ b/ext/soap/tests/bugs/bug43045.phpt @@ -39,7 +39,7 @@ $client = new TestSoapClient(NULL, array( "location" => "test://", "uri" => 'urn:TestSOAP', "style" => SOAP_RPC, - "use" => SOAP_ENCODED + "use" => SOAP_ENCODED )); var_dump($client->test(0.1)); var_dump($client->test(NAN)); diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt index e25c6fb8599..b65b23fd063 100644 --- a/ext/soap/tests/server029.phpt +++ b/ext/soap/tests/server029.phpt @@ -1,5 +1,5 @@ --TEST-- -SOAP Server 29-CGI: new/addfunction/handle +SOAP Server 29-CGI: new/addfunction/handle --POST-- <?xml version="1.0" encoding="ISO-8859-1"?> <SOAP-ENV:Envelope diff --git a/ext/sockets/tests/socket_accept-wrongparams.phpt b/ext/sockets/tests/socket_accept-wrongparams.phpt index 6bce05a78bf..644690d61c4 100644 --- a/ext/sockets/tests/socket_accept-wrongparams.phpt +++ b/ext/sockets/tests/socket_accept-wrongparams.phpt @@ -10,7 +10,7 @@ if (!extension_loaded('sockets')) { var_dump(socket_accept(null)); --CREDITS-- Till Klampaeckel, till@php.net -Berlin TestFest 2009 +Berlin TestFest 2009 --EXPECTF-- Warning: socket_accept() expects parameter 1 to be resource, null given in %s on line %d NULL diff --git a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt index ea14fd31693..57d8656e871 100644 --- a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt @@ -1,8 +1,8 @@ --TEST-- Test if socket_set_option() works, option:SO_RCVTIMEO --DESCRIPTION-- --wrong params --set/get params comparison +-wrong params +-set/get params comparison --SKIPIF-- <?php if (!extension_loaded('sockets')) { diff --git a/ext/sockets/tests/socket_set_option_sndtimeo.phpt b/ext/sockets/tests/socket_set_option_sndtimeo.phpt index 6fd008c3ded..3be634341b0 100644 --- a/ext/sockets/tests/socket_set_option_sndtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_sndtimeo.phpt @@ -1,8 +1,8 @@ --TEST-- Test if socket_set_option() works, option:SO_SNDTIMEO --DESCRIPTION-- --wrong params --set/get params comparison +-wrong params +-set/get params comparison --SKIPIF-- <?php if (!extension_loaded('sockets')) { diff --git a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt index 36c72de191f..60203eb4a07 100644 --- a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt @@ -1,5 +1,5 @@ --TEST-- -Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter. +Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter. --CREDITS-- Philip Norton philipnorton42@gmail.com --FILE-- diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt index 2446db22571..9d6c4505d8f 100644 --- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt +++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt @@ -1,5 +1,5 @@ --TEST-- -Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter. +Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter. --CREDITS-- Philip Norton philipnorton42@gmail.com --FILE-- diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt index e4ea7fe8f12..bacdcb1daa3 100644 --- a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt +++ b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::fflush function - basic test +SplFileObject::fflush function - basic test --FILE-- <?php /* diff --git a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt index 55b7481d950..0bd349fc926 100644 --- a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt +++ b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::fpassthru function - basic functionality test +SplFileObject::fpassthru function - basic functionality test --FILE-- <?php $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv'); diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt index fba9a1bf19d..f5583a81951 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt @@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with all parameters specified 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 ( @@ -54,12 +54,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt index ed684179b8e..57f5681517e 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt @@ -7,8 +7,8 @@ SplFileObject::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 */ @@ -47,12 +47,12 @@ foreach ($fields as $field) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt index 2deafac1ea7..ede8e594133 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt @@ -7,8 +7,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure value 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 ( @@ -54,12 +54,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt index aee1da3559e..c4bc9f112d9 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt @@ -8,8 +8,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure and differe 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 ( @@ -55,12 +55,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt index b7c2a6381d9..9edaf571fe2 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt @@ -1,5 +1,5 @@ --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 diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt index f83bc6755f9..4b9e930c7c0 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt @@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with default arguments value 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 ( @@ -54,12 +54,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt index ffa2b320c6c..842bb563d1c 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and enclosure +Test fputcsv() : usage variations - with different delimiter and enclosure --FILE-- <?php @@ -10,8 +10,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 ( @@ -57,12 +57,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt index 72fb34efa6d..0f9b8ce366f 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fputcsv() : usage variations - with different delimiter and same enclosure +Test fputcsv() : usage variations - with different delimiter and same enclosure --FILE-- <?php @@ -10,8 +10,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 ( @@ -57,12 +57,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt index 4eab3d74e47..64f32187ac9 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test fputcsv() : usage variations - with same delimiter and different enclosure +Test fputcsv() : usage variations - with same delimiter and different enclosure --FILE-- <?php @@ -10,8 +10,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 ( @@ -57,12 +57,12 @@ foreach ($csv_lists as $csv_list) { //close the file unset($fo); - // print the file contents + // print the file contents var_dump( file_get_contents($file) ); //delete file unlink($file); - } //end of mode loop + } //end of mode loop } // end of foreach echo "Done\n"; diff --git a/ext/spl/tests/SplFileObject_fscanf_basic.phpt b/ext/spl/tests/SplFileObject_fscanf_basic.phpt index 5279039f0c3..2f668ac73e0 100644 --- a/ext/spl/tests/SplFileObject_fscanf_basic.phpt +++ b/ext/spl/tests/SplFileObject_fscanf_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::fscanf function - basic functionality test +SplFileObject::fscanf function - basic functionality test --FILE-- <?php $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv'); diff --git a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt index 121d12e0292..831e855b856 100644 --- a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt +++ b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::ftruncate function - truncating with stream that does not support truncation +SplFileObject::ftruncate function - truncating with stream that does not support truncation --FILE-- <?php diff --git a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt index 296a1f36c9b..0418086e9ee 100644 --- a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt +++ b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::fpassthru function - parameters test +SplFileObject::fpassthru function - parameters test --FILE-- <?php $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv'); diff --git a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt index 4e3de4bab2e..5c65a1b76bf 100644 --- a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt +++ b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt @@ -1,5 +1,5 @@ --TEST-- -SplFileObject::getCsvControl function - basic test +SplFileObject::getCsvControl function - basic test --FILE-- <?php $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv'); diff --git a/ext/spl/tests/SplFileObject_rewind_error001.phpt b/ext/spl/tests/SplFileObject_rewind_error001.phpt index 5f2379aa139..2e4aefb7a77 100644 --- a/ext/spl/tests/SplFileObject_rewind_error001.phpt +++ b/ext/spl/tests/SplFileObject_rewind_error001.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: SplFileObject::rewind() with a parameter. +SPL: SplFileObject::rewind() with a parameter. --CREDITS-- Ricardo Oedietram <ricardo@odracir.nl> Erwin Poeze <erwin.poeze@gmail.com> diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt index d28e190de72..83b3e27d888 100644 --- a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt +++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Check that SplObjectStorage::removeUncommon functions when receiving proper input +Check that SplObjectStorage::removeUncommon functions when receiving proper input --CREDITS-- Matthew Turland (me@matthewturland.com) --FILE-- diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt index e945def6562..6c6fd2949ff 100644 --- a/ext/spl/tests/arrayObject_asort_basic1.phpt +++ b/ext/spl/tests/arrayObject_asort_basic1.phpt @@ -4,7 +4,7 @@ SPL: Test ArrayObject::asort() function : basic functionality with array based s <?php /* Prototype : int ArrayObject::asort() * Description: proto int ArrayIterator::asort() - * Sort the entries by values. + * Sort the entries by values. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt index a5158536ee2..a736365dbd5 100644 --- a/ext/spl/tests/arrayObject_asort_basic2.phpt +++ b/ext/spl/tests/arrayObject_asort_basic2.phpt @@ -4,7 +4,7 @@ SPL: Test ArrayObject::asort() function : basic functionality with object based <?php /* Prototype : int ArrayObject::asort() * Description: proto int ArrayIterator::asort() - * Sort the entries by values. + * Sort the entries by values. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_clone_basic1.phpt b/ext/spl/tests/arrayObject_clone_basic1.phpt index 67876330f55..0adb3eca4ed 100644 --- a/ext/spl/tests/arrayObject_clone_basic1.phpt +++ b/ext/spl/tests/arrayObject_clone_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Cloning an instance of ArrayObject which wraps an array. +SPL: Cloning an instance of ArrayObject which wraps an array. --FILE-- <?php $a = array(1,2); diff --git a/ext/spl/tests/arrayObject_clone_basic2.phpt b/ext/spl/tests/arrayObject_clone_basic2.phpt index dccd26492f2..3bcebc7970b 100644 --- a/ext/spl/tests/arrayObject_clone_basic2.phpt +++ b/ext/spl/tests/arrayObject_clone_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Cloning an instance of ArrayObject which wraps an object. +SPL: Cloning an instance of ArrayObject which wraps an object. --FILE-- <?php class C { } diff --git a/ext/spl/tests/arrayObject_clone_basic3.phpt b/ext/spl/tests/arrayObject_clone_basic3.phpt index 53afecb58f4..27f20987404 100644 --- a/ext/spl/tests/arrayObject_clone_basic3.phpt +++ b/ext/spl/tests/arrayObject_clone_basic3.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Cloning nested ArrayObjects. +SPL: Cloning nested ArrayObjects. --FILE-- <?php class C { diff --git a/ext/spl/tests/arrayObject_count_basic1.phpt b/ext/spl/tests/arrayObject_count_basic1.phpt index a003c2cf67f..b0643d5754f 100644 --- a/ext/spl/tests/arrayObject_count_basic1.phpt +++ b/ext/spl/tests/arrayObject_count_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: ArrayObject::count() and ArrayIterator::count() basic functionality. +SPL: ArrayObject::count() and ArrayIterator::count() basic functionality. --FILE-- ==ArrayObject== <?php diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt index 63315d531c2..a7494930075 100644 --- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt +++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality +SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality --FILE-- <?php class MyIterator extends ArrayIterator { diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt index 43a2a2c578b..1692a02ef1d 100644 --- a/ext/spl/tests/arrayObject_ksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -SPL: Test ArrayObject::ksort() function : basic functionality with array based store +SPL: Test ArrayObject::ksort() function : basic functionality with array based store --FILE-- <?php /* Prototype : int ArrayObject::ksort() * Description: proto int ArrayIterator::ksort() - * Sort the entries by key. + * Sort the entries by key. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt index 824165ddb87..21cb74cf391 100644 --- a/ext/spl/tests/arrayObject_ksort_basic2.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt @@ -1,10 +1,10 @@ --TEST-- -SPL: Test ArrayObject::ksort() function : basic functionality with object base store +SPL: Test ArrayObject::ksort() function : basic functionality with object base store --FILE-- <?php /* Prototype : int ArrayObject::ksort() * Description: proto int ArrayIterator::ksort() - * Sort the entries by key. + * Sort the entries by key. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt index 3c73cfa0777..7e7095fe385 100644 --- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -SPL: Test ArrayObject::natcasesort() function : basic functionality +SPL: Test ArrayObject::natcasesort() function : basic functionality --FILE-- <?php /* Prototype : int ArrayObject::natcasesort() * Description: proto int ArrayIterator::natcasesort() - Sort the entries by values using case insensitive "natural order" algorithm. + Sort the entries by values using case insensitive "natural order" algorithm. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt index 41d5b608299..478dd2b5623 100644 --- a/ext/spl/tests/arrayObject_natsort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -SPL: Test ArrayObject::natsort() function : basic functionality +SPL: Test ArrayObject::natsort() function : basic functionality --FILE-- <?php /* Prototype : int ArrayObject::natsort() * Description: proto int ArrayIterator::natsort() - Sort the entries by values using "natural order" algorithm. + Sort the entries by values using "natural order" algorithm. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_setFlags_basic1.phpt b/ext/spl/tests/arrayObject_setFlags_basic1.phpt index d40057dfabd..b8bf099dd6e 100644 --- a/ext/spl/tests/arrayObject_setFlags_basic1.phpt +++ b/ext/spl/tests/arrayObject_setFlags_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622. +SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622. --FILE-- <?php class C extends ArrayObject { @@ -11,7 +11,7 @@ function access_p($ao) { var_dump(isset($ao->p)); // read var_dump($ao->p); - // write + // write $ao->p = $ao->p . '.changed'; var_dump($ao->p); } diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt index 0cf15a0254b..b07aec206ba 100644 --- a/ext/spl/tests/arrayObject_uasort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -SPL: Test ArrayObject::uasort() function : basic functionality +SPL: Test ArrayObject::uasort() function : basic functionality --FILE-- <?php /* Prototype : int ArrayObject::uasort(callback cmp_function) * Description: proto int ArrayIterator::uasort(callback cmp_function) - Sort the entries by values user defined function. + Sort the entries by values user defined function. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt index 9706eadfca4..e8b52f9e59b 100644 --- a/ext/spl/tests/arrayObject_uasort_error1.phpt +++ b/ext/spl/tests/arrayObject_uasort_error1.phpt @@ -1,10 +1,10 @@ --TEST-- -Test ArrayObject::uasort() function : wrong arg count +Test ArrayObject::uasort() function : wrong arg count --FILE-- <?php /* Prototype : int ArrayObject::uasort(callback cmp_function) * Description: proto int ArrayIterator::uasort(callback cmp_function) - Sort the entries by values user defined function. + Sort the entries by values user defined function. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt index c7f2d3d1886..b770f1fe1db 100644 --- a/ext/spl/tests/arrayObject_uksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt @@ -1,10 +1,10 @@ --TEST-- -Test ArrayObject::uksort() function : basic functionality +Test ArrayObject::uksort() function : basic functionality --FILE-- <?php /* Prototype : int ArrayObject::uksort(callback cmp_function) * Description: proto int ArrayIterator::uksort(callback cmp_function) - * Sort the entries by key using user defined function. + * Sort the entries by key using user defined function. * Source code: ext/spl/spl_array.c * Alias to functions: */ diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt index 8e63ca4a5b0..e72eec0bf9a 100644 --- a/ext/spl/tests/arrayObject_uksort_error1.phpt +++ b/ext/spl/tests/arrayObject_uksort_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test ArrayObject::uksort() function : wrong arg count +Test ArrayObject::uksort() function : wrong arg count --FILE-- <?php /* Prototype : int ArrayObject::uksort(callback cmp_function) diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt index d5317a11c51..e82953be705 100644 --- a/ext/spl/tests/array_003.phpt +++ b/ext/spl/tests/array_003.phpt @@ -3,8 +3,8 @@ SPL: ArrayObject from object --FILE-- <?php -// This test also needs to exclude the protected and private variables -// since they cannot be accessed from the external object which iterates +// This test also needs to exclude the protected and private variables +// since they cannot be accessed from the external object which iterates // them. class test diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt index 0bd9ef9a6d9..5b7d89068d8 100644 --- a/ext/spl/tests/array_007.phpt +++ b/ext/spl/tests/array_007.phpt @@ -3,8 +3,8 @@ SPL: ArrayObject/Iterator from IteratorAggregate --FILE-- <?php -// This test also needs to exclude the protected and private variables -// since they cannot be accessed from the external object which iterates +// This test also needs to exclude the protected and private variables +// since they cannot be accessed from the external object which iterates // them. class test implements IteratorAggregate diff --git a/ext/spl/tests/bug49723.phpt b/ext/spl/tests/bug49723.phpt index 221e8066118..1557cbc15d4 100644 --- a/ext/spl/tests/bug49723.phpt +++ b/ext/spl/tests/bug49723.phpt @@ -1,5 +1,5 @@ --TEST-- -LimitIterator: do not seek if not needed +LimitIterator: do not seek if not needed --FILE-- <?php diff --git a/ext/spl/tests/bug53515.phpt b/ext/spl/tests/bug53515.phpt index 8ecb02b1e61..53ecd5c2aff 100644 --- a/ext/spl/tests/bug53515.phpt +++ b/ext/spl/tests/bug53515.phpt @@ -11,7 +11,7 @@ $a[''] = ''; foreach ($a as $key => $value) { echo $key . ': ' . (is_null($value) ? 'null' : @"$value") . - ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') . + ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') . ' property_exists: ' . (property_exists($o, $key) ? 'true' : 'false'),"\n"; } diff --git a/ext/spl/tests/bug66834.phpt b/ext/spl/tests/bug66834.phpt index 66686c771ab..eed26c815f4 100644 --- a/ext/spl/tests/bug66834.phpt +++ b/ext/spl/tests/bug66834.phpt @@ -4,7 +4,7 @@ SPL: Bug #66834 <?php // overrides both offsetExists and offsetGet -class ArrayObjectBoth extends ArrayObject +class ArrayObjectBoth extends ArrayObject { public function offsetExists($offset) { var_dump('Called: '.__METHOD__); @@ -18,7 +18,7 @@ class ArrayObjectBoth extends ArrayObject } // overrides only offsetExists -class ArrayObjectExists extends ArrayObject +class ArrayObjectExists extends ArrayObject { public function offsetExists($offset) { var_dump('Called: '.__METHOD__); @@ -27,7 +27,7 @@ class ArrayObjectExists extends ArrayObject } // overrides only offsetGet -class ArrayObjectGet extends ArrayObject +class ArrayObjectGet extends ArrayObject { public function offsetGet($offset) { var_dump('Called: '.__METHOD__); diff --git a/ext/spl/tests/class_implements_basic.phpt b/ext/spl/tests/class_implements_basic.phpt index a0a53a82df6..986b81e8bc0 100644 --- a/ext/spl/tests/class_implements_basic.phpt +++ b/ext/spl/tests/class_implements_basic.phpt @@ -1,9 +1,9 @@ --TEST-- -SPL: Test class_implements() function : basic +SPL: Test class_implements() function : basic --FILE-- <?php /* Prototype : array class_implements(mixed what [, bool autoload ]) - * Description: Return all classes and interfaces implemented by SPL + * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c * Alias to functions: */ diff --git a/ext/spl/tests/class_implements_basic2.phpt b/ext/spl/tests/class_implements_basic2.phpt index 26ec2880153..6eb3af4556b 100644 --- a/ext/spl/tests/class_implements_basic2.phpt +++ b/ext/spl/tests/class_implements_basic2.phpt @@ -1,9 +1,9 @@ --TEST-- -SPL: Test class_implements() function : basic +SPL: Test class_implements() function : basic --FILE-- <?php /* Prototype : array class_implements(mixed what [, bool autoload ]) - * Description: Return all classes and interfaces implemented by SPL + * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c * Alias to functions: */ diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt index a3e33a17612..7498a14559b 100644 --- a/ext/spl/tests/class_implements_variation.phpt +++ b/ext/spl/tests/class_implements_variation.phpt @@ -3,7 +3,7 @@ SPL: Test class_implements() function : variation - no interfaces and autoload --FILE-- <?php /* Prototype : array class_implements(mixed what [, bool autoload ]) - * Description: Return all classes and interfaces implemented by SPL + * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c * Alias to functions: */ diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt index 01044458e1c..9d876d3a361 100644 --- a/ext/spl/tests/class_implements_variation1.phpt +++ b/ext/spl/tests/class_implements_variation1.phpt @@ -1,9 +1,9 @@ --TEST-- -SPL: Test class_implements() function : variation +SPL: Test class_implements() function : variation --FILE-- <?php /* Prototype : array class_implements(mixed what [, bool autoload ]) - * Description: Return all classes and interfaces implemented by SPL + * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c * Alias to functions: */ diff --git a/ext/spl/tests/class_implements_variation2.phpt b/ext/spl/tests/class_implements_variation2.phpt index 6e05820dacf..d63669fbec5 100644 --- a/ext/spl/tests/class_implements_variation2.phpt +++ b/ext/spl/tests/class_implements_variation2.phpt @@ -1,9 +1,9 @@ --TEST-- -SPL: Test class_implements() function : variation +SPL: Test class_implements() function : variation --FILE-- <?php /* Prototype : array class_implements(mixed what [, bool autoload ]) - * Description: Return all classes and interfaces implemented by SPL + * Description: Return all classes and interfaces implemented by SPL * Source code: ext/spl/php_spl.c * Alias to functions: */ diff --git a/ext/spl/tests/class_uses_basic.phpt b/ext/spl/tests/class_uses_basic.phpt index 99070d623f1..8cad9cab07c 100644 --- a/ext/spl/tests/class_uses_basic.phpt +++ b/ext/spl/tests/class_uses_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Test class_implements() function : basic +SPL: Test class_implements() function : basic --FILE-- <?php /* Prototype : array class_uses(mixed what [, bool autoload ]) diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt index ed656639e61..be4bfa08d00 100644 --- a/ext/spl/tests/class_uses_basic2.phpt +++ b/ext/spl/tests/class_uses_basic2.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Test class_uses() function : basic +SPL: Test class_uses() function : basic --FILE-- <?php /* Prototype : array class_uses(mixed what [, bool autoload ]) diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt index 8e27db6b9b1..be6aa9ac7f2 100644 --- a/ext/spl/tests/class_uses_variation1.phpt +++ b/ext/spl/tests/class_uses_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Test class_uses() function : variation +SPL: Test class_uses() function : variation --FILE-- <?php /* Prototype : array class_uses(mixed what [, bool autoload ]) diff --git a/ext/spl/tests/class_uses_variation2.phpt b/ext/spl/tests/class_uses_variation2.phpt index bb560ff44f0..6458bd178cf 100644 --- a/ext/spl/tests/class_uses_variation2.phpt +++ b/ext/spl/tests/class_uses_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Test class_uses() function : variation +SPL: Test class_uses() function : variation --FILE-- <?php /* Prototype : array class_uses(mixed what [, bool autoload ]) diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt index fa9e6db173e..781614abcc2 100644 --- a/ext/spl/tests/fileobject_005.phpt +++ b/ext/spl/tests/fileobject_005.phpt @@ -21,7 +21,7 @@ var_dump($fo->fgets(8)); $fo->rewind(); $fo->fwrite("blahlubba"); -// This should throw a warning and return NULL since an argument is missing +// This should throw a warning and return NULL since an argument is missing var_dump($fo->ftruncate()); ?> diff --git a/ext/spl/tests/fileobject_getbasename_basic.phpt b/ext/spl/tests/fileobject_getbasename_basic.phpt index 34fecdc31c4..5fb7ffdec2a 100644 --- a/ext/spl/tests/fileobject_getbasename_basic.phpt +++ b/ext/spl/tests/fileobject_getbasename_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: SplFileObject::getBasename +SPL: SplFileObject::getBasename --CREDITS-- H�vard Eide <nucleuz at gmail.com> #Testfest php.no diff --git a/ext/spl/tests/filesystemiterator_flags.phpt b/ext/spl/tests/filesystemiterator_flags.phpt index 635345655b3..c74129760c0 100644 --- a/ext/spl/tests/filesystemiterator_flags.phpt +++ b/ext/spl/tests/filesystemiterator_flags.phpt @@ -10,7 +10,7 @@ printflags($it); $it->setFlags(FileSystemIterator::CURRENT_AS_SELF | FileSystemIterator::KEY_AS_FILENAME | - FileSystemIterator::SKIP_DOTS | + FileSystemIterator::SKIP_DOTS | FileSystemIterator::UNIX_PATHS); printflags($it); diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt index 03c7350fa23..5175f41c0c3 100644 Binary files a/ext/spl/tests/iterator_049b.phpt and b/ext/spl/tests/iterator_049b.phpt differ diff --git a/ext/spl/tests/iterator_057.phpt b/ext/spl/tests/iterator_057.phpt index 64d9951021f..61c1dfced61 100644 --- a/ext/spl/tests/iterator_057.phpt +++ b/ext/spl/tests/iterator_057.phpt @@ -5,7 +5,7 @@ Sebastian Schürmann --FILE-- <?php /** - * From Docs: Construct a new array iterator from anything that has a hash table. + * From Docs: Construct a new array iterator from anything that has a hash table. * NULL, NOTHING is not a hash table ;) */ class myArrayIterator extends ArrayIterator { diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt index 544c7602a0e..f45625f045f 100644 --- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt +++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: CachingInterator constructor flag checks +SPL: CachingInterator constructor flag checks --CREDITS-- Sean Burlington www.practicalweb.co.uk TestFest London May 2009 diff --git a/ext/spl/tests/spl_classes.phpt b/ext/spl/tests/spl_classes.phpt index 172c4ab92d5..9d897c497dd 100644 --- a/ext/spl/tests/spl_classes.phpt +++ b/ext/spl/tests/spl_classes.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: spl_classes() function +SPL: spl_classes() function --CREDITS-- Sebastian Schürmann sebs@php.net diff --git a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt index 8726f4b32a0..823c809f825 100644 --- a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt +++ b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: SplHeap check no arguments to be accepted on recoverFromCorruption +SPL: SplHeap check no arguments to be accepted on recoverFromCorruption --CREDITS-- Rohan Abraham (rohanabrahams@gmail.com) TestFest London May 2009 diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt index bbdcc34f0af..97ceee219c0 100644 --- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt +++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: IteratorInterator constructor checks +SPL: IteratorInterator constructor checks --CREDITS-- Sean Burlington www.practicalweb.co.uk TestFest London May 2009 diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt index d07e7a1421c..4b8cfaa53d8 100644 --- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt +++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: Test on RecursiveIteratorIterator key function checking switch statements +SPL: Test on RecursiveIteratorIterator key function checking switch statements --CREDITS-- Rohan Abraham (rohanabrahams@gmail.com) TestFest London May 2009 diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 9257ce951b1..c82f5f7fd0b 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 4e046dfbedf..017456917eb 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 1ce78d51fec..ca9a21128bc 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 1f1120ef143..450d8bc0ce3 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 4ca3f398b41..4dd28d9a396 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 e04b32f89a0..83a642dc3e1 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 022cee099da..aa4c77fe3a5 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 b58e78317fe..a86af304726 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 c4aaa0bde40..182927fa269 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 b7539c63a6a..cd62ae1db70 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 423310d7ab5..4b82cf6b878 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 8a5c5726b12..b84b0871f42 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 030324c3202..10dcc9e5ba5 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 5197945994f..d2cbbe16e39 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 8c0a2cccf52..e4437ccf1a8 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 b36c194a874..ea6468cd8bf 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 26eefc35071..6492410c663 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 66e431c0e84..d82f9fcc5f2 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 8d360928228..50050892e70 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 e761a728226..96344b074fc 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 3d205317042..513487fab85 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 40fb677234b..6079f4119e4 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 aa5a1afe1b3..efb4e68cf62 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 4224f1c8eb3..2d820a0d218 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 afb16971fe7..f9978f54760 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 9c350c8aa38..2d888df6949 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 5d03ffe0680..ba349c39217 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 9fd38528305..dd3187a1f04 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 654ba0f16a7..1e51c9886eb 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 a02868362b3..8aaf445f932 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 2d41fd7bc1e..c66c2a47189 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 2368973e122..3eb92b49d41 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 919bd9b3ad4..92be6735016 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 211907c726d..e3513a9346a 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 c930dd5951b..89277f787ac 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 79aae55d4f2..fcddbb394db 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 566d89973ee..c5e95ad3934 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 80278ed9a57..36d31b078be 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 047fe9ede15..d0f70580ff9 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 ddaebb85efb..0039770269b 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 4d519b00f24..b8894e5d7e7 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 eeb881f6294..99bfd6638e6 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 52d3a2e98bf..8569703435c 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 55964711e3a..bbb59144965 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 4ef78f88f9f..418dbc5b392 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 019cffb1ef9..67c1b6fcc45 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 6f6fcb9a4dc..40d02d47852 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 90168f5de66..05d5cf3c276 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 689cbd6ae2d..179b07259a7 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 e404fe680dc..fb0bcd67968 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 029792d12b5..cf8ae6db9bc 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 4b8a6629304..80755540f5b 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 e82f1759d46..0885cfeacfe 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 71fb9881a1a..a081571930c 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 72da179f6d1..3b255b8b19e 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 bbe3921ca06..1a08d78f162 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 6a96be6b7c6..419b916fd89 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 0f9f82464cc..d90c80f20b7 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 2e035cc8b24..aad42705dbe 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 4af3023c037..a32d566062b 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 6d03dc5fa99..d317bfcde05 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 1b18d37d7b4..c0f88f50516 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 4094218697a..53a45ee2783 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 a98a2800dac..f8fc5a4b4b7 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 c756e48d117..ae664f9812b 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 3218dd3b6c9..6f413f623e6 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 0c530739f6d..8ea51a41035 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 dde0b1ea079..9cd44cf1d8c 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 998cc33f42c..463ca80d5c6 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 cbc1d8305cb..4312688c596 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 40062170c40..7bbe12212be 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 eb4833bc753..fa36ea3ac23 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 7ac309a01e9..3dde1646af6 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 1a73bdfd5f9..92b6ce0f2c7 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 386447c5f0c..bbf349c4fd6 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 58a040b0a76..09b4a702372 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 0ad3fbac5e8..074be3bae8c 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 8a825d361ec..38141a430ce 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 a1f18972082..572061d6978 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 a0399c2fa45..b34083308e5 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 8d0a5cffc9b..7606212023b 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 713967c9c1b..1131922fc81 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 d76bae5232c..16ba89e9f15 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 cf0e3e221db..0048bbb3fae 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 d75aac07156..5fdb0d4e249 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 1349db4adf2..e162c523d64 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 ec9291f9f85..239326821fa 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 3d76714ca73..a501246fa0a 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 08f921c38d3..879a3b8aae3 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 17c8db1c356..d79686ed6f9 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 67b978845da..be0340b9f10 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 392715657cb..085831c020a 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 8274d858cac..37b819895ab 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 99f9614d72c..9d768fa7317 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 83302378f07..05b6a1eb026 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 0ac3d08bc95..5575cee6d64 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 33ee2b3858a..2fbdb850c35 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 e4aba5f0f7f..59a2301c111 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 ea27fbdf772..234aa6ef696 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 368a3c8729f..de62bf4b30b 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 aac8915935e..6d37a916bae 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 20ba8248f9f..086a10df2ac 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 bed1cc210ff..c784b544150 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 54ec0ec8800..f3bdef1b61f 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 9872d256faf..ba3a70c4824 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 0d1ec464b72..1209aea44d8 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 96531197ea7..9c1857c61d4 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 d469774026a..e0b1b5f0cdd 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 5253fb4c1f8..53e0fb5bec3 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 28c10ff2e67..b2a51ab2c60 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 3f8f51bc14a..14fb78fb12b 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 2126b4c4825..3ea93e56023 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 c9c1ab75648..f75b03cbed8 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 b23618794ea..4749fe8e45d 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 1aa262ba62b..d47761f4701 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 c4a12e661b2..be00f25d8d1 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 45ac232aedb..f8b71dc10b7 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 af83fcbc949..81d9929c154 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 108f4745130..665481a6c83 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 25e3c94d318..efbe141fe56 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 810cb897327..8fa91d824a2 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 81554f13e1f..ed89d13d35b 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 c2c29b29528..ab8cf271b10 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 a081a819391..3912162dd80 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 3aa0f98271a..c193a00896e 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 8df3a11eeae..98aa459362b 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 index 997c391306e..8d86210f0f6 100644 Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt index a3ad5acd884..1f6fb5804cd 100644 Binary files a/ext/standard/tests/array/array_flip_variation3.phpt and b/ext/standard/tests/array/array_flip_variation3.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt index 405e518b633..b8badb0caad 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 cf60dc6955e..3ba0cf1aa41 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 c1d381051a4..6161d9cf0a9 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 c371071b38b..a06dbddefee 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 95631fc1ac2..4f15ff48d15 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 af7df4f35ce..44eaf4d4103 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 495ec30ff93..911380c25cb 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 f3e6964d7b1..e40f56bed00 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 9ffbaac77a9..ca803e50a96 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 48a502fcc40..26a491ad64f 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 03661f2756d..6c826c4045f 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 46f77ac9bd3..373a0ddbe0e 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 fc6e177f54c..c24a4c1b082 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 9509e97b9c8..10ad8ad3423 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 b98832461ac..fb9dd2c7aa2 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 56e5f1494d5..5d2147b99ff 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 00875ee9ffb..dca52bafc28 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 396248728a9..8b49ba8db10 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 cf53919256a..fb01bb92074 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 fa6bf02776d..da0115e3688 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 2698681d8e1..589893db5a1 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 29d1f3ba7e5..9a84b2aead2 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 ae7acb133bc..f7ee0303edb 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 d8e87e42771..064def0f5a2 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 cf2611aeb9a..c880f7a057e 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 b471d93a955..4830baaf10c 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 01facf23551..e18417aa02f 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 e5d0f565689..d998721bd80 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 db21b9b01ea..57ed1322fe5 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 1d449e8fb0e..793ec3d2523 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 ab3e7d14b44..c91a07fc3c9 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 69a6500d2f6..7156bf5404d 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 79bf2b07afd..0688004fba2 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 1236bcd3df2..d99059e52d1 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 82ac5831318..38e2e761347 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 10e5b7f0999..17b98bb81e0 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 6f5431b1b6c..6e578414571 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 96fef2a48dc..6f18ba56945 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 89286f8986b..c686899aad3 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 5094d54435f..6b9a802af13 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 f6836c1bda2..9536dd8c2a2 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 266f9b8f89c..b45e0da74fd 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 932841107e4..1db37b84675 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 aa0f0b704af..e6d22405ba8 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 93419842cb7..e019e4ef3ef 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 14f8cdd6d19..6626c68de28 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 8534bd2a8af..e605b86bd13 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 c6e12512f1a..4da1b9b7aca 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 de13518ade8..2934fe09a4e 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 74d1c833e7d..6c7c956ea73 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 c1d1cc2e8f2..61faf0158dd 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 6ebaf56ded6..46982b74901 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 8b189c80e17..1691cc5fa1b 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 e55ce937063..cec69df3dc8 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 681f6413f95..2b4897730ca 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 b3df9783a62..b989160db78 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 183f0605c4c..0b0dff3c44b 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 e8a52a70595..0517d4c24e6 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 4bf3473ef3c..cbbfb5f789a 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 461a8719ea8..53899c675ab 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 4efca6cb2dc..bcf0adfdfc4 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 62118822229..493291bc9c3 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 9dc1f0626c3..b44f86b97e1 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 bda5700c3a8..e9944ed1129 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 6fa5e4225df..e02e4095d81 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 c98b2cf29ce..7cfb528bf28 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 9424c441104..114d1d31349 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 12cf551da51..5b801269660 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 6a17b299ee4..e169f591c85 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 5c6d9fb97a6..b258c2d31b9 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 d83f78cbfa6..059869326db 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 e2176df7609..1cfbdd7beb5 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 e0ab99b0428..ee4c65ceb3e 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 44ad1421849..e75cec186aa 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 205260b2a5e..e6a8096282c 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 fcf9131ed8f..749faab6ae1 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 a017c27530f..38e672e32c7 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 e22208753e0..efda3d531b1 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 ce17a06b89e..3cdc90e2bb5 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 d7d717297e9..ffa9cc998e6 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 67a45e33c8f..071e9eadb59 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 224b594a8a9..8e28b7434cb 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 64eacb784f1..f14d5d9bb31 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 dfbfc563371..f73dd9c6286 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 76e2ee399c9..34cdfe409fe 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 22819dfb37c..17fb7eb070d 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 419eed5d11c..45e6c7ee77e 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 59a94024f17..c35e976b5ed 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 76821fae0f5..6cec33a532d 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 00a197a29e2..37596f4f009 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 7b67b4840df..fd7e9ccfc8a 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 6eec1d98e57..89121dd0d0f 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 05e520d67fe..b995625861b 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 143d4ca1e62..a409e286177 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 3ddc0682448..1d549c56477 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 fedf61e96ec..7812bb766e4 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 700bbb8913c..38b9142c09d 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 95daa105580..9872ac676b9 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 79248b0cbcc..cb2b4a4c0ce 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 af597315581..0e5e3df6841 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 ce4be6bd9aa..390640700c3 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 d1ea4663d22..7dcb5c12b5c 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 b03c2f2d334..a20a0f11516 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 66f57d72574..56fb3df5826 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 21d6844864d..79ff8e99c6e 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 f84b73c773f..f34c501eec3 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 e761a9649ca..5e84548d7ed 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 e6c068e2762..17bdeae5cdb 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 ab2bfcca3d8..8c26a8347be 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 49bae0ff341..28130e31fd2 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 6ec0f5720c7..562be2e70e6 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 bb18e9893f9..29538468253 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 70b03a4bd0b..f5ffb8a7e48 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 7c6dd5f135e..4ad68efe193 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 17653153372..6d89dd0c6c0 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 7c76919d234..8d422b78c07 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 63b4c83bf00..d0dc9ccb7f3 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 c4ef0f2d42b..b806139d57f 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 77a2d6e9499..c95303974d4 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 b761d615a70..e948fce989c 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 4aaf2112b9a..3ef23b92108 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 799e7ea0ca7..b8f2013dc3d 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 0f81835c17c..38faf712e16 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 9202ef20c8a..cd3f24afff7 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 51d0c12ca61..c79077c78f4 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 36e9f5708a0..09284d90962 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 ff4ab2d7118..d4e7148aba7 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 ec866348b2f..163c0984eb9 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 5d7b655a426..c50683b7804 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 766d8459d1d..c04cf4073f8 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 0cb14b5039b..e61d54ee827 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 8b7ef48ce7f..74ec7717085 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 e5024daccff..650dd70c604 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 3cf0d7f91cb..c0057268c24 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 30b5b5ce9ad..46d265aa990 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 b9e75c96799..4ff93c8652b 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 30cc85ae6c7..2ffae12178d 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 4e3e13462b1..438f2d08841 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 9978673e50b..b2e566d12d3 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 b858a13e7de..6c656ef55e5 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 f2a665185af..27f16200037 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 734c6267b9e..7c4043e4640 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 3f1fea28cd5..d60630eb324 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 0cbb2c6428b..88070dee554 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 a2a396b5567..618a22282ae 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 d1cb97e2c43..853ceb946bc 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 274259129df..099af89a9f9 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 abca4e4ae53..5ec38461a68 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 88a62b8573f..c6844be47a4 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 faf7e8243f3..bfa9c5130be 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 a71ec8311d7..88f36ea0257 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 5c889ee1185..dbd316ab8a2 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 2355008261f..cbbf714b6f8 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 e030adc2bcf..014240f6bb3 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 fcfb931f10c..c44124df056 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 14615a1f61c..0e1aed52d6b 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 f1a2bc9bfc3..7f5d618e749 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 303d295e12c..65d2c72dac0 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 150f312e705..4ccf9478d67 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 58eab552470..faae551cc22 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 1840e080d24..6b271e0e48c 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 02af5dd4a1e..7217a11a91a 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 2f2fba5bd72..a48d9078965 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 fdf932605be..0bfa2e030e2 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 295d9625a08..8c32685d393 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 0e8f1c75718..94acd08a96d 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 c2b48a94f63..6a836dc1ee1 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 54de5740dd3..bb63e9f6e57 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 0af0959989c..da8a00e83fa 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 40deacabb7b..de2c3b4d281 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 90a1ac4a359..c640ac7bd21 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 fb632c2bf95..49e717f8553 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 c1a673a8f73..e88939e6043 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 96c8462df60..1cd546e63c9 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 011a50f9ddd..99c30e09d7b 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 ecd787a0699..4abd1afe82f 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 ecbc15fae62..e7c69202a32 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 209405d3d30..0433fca4dc3 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 c795c2acd14..30e28470043 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 e7462381558..71abe036962 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 25b565cd26e..15c11fcccf3 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 af03d7fb7b6..1b7043e56a0 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 ee1c186c187..db73114aa05 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 950f2e2a200..c3a20af5eda 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 fbc426902f6..7ed8723be0f 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 d115bcc3266..26c4f317615 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 eec33b05303..ae7c3b9586c 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 c813e9383ba..eca26a30e67 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 44b78a75f1e..2cbc9572d2b 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 bdc0b015961..1a2c1ed9782 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 324aacbca31..0f4da2c29dd 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 bcd748fe01f..20a5afa2020 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 680f65c6cfc..10afe341a3b 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 5dbece34cc2..f5348852bf8 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 c3063d30464..7eb7e3b0684 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 51b4bc17592..9f7e1794986 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 c157a53946e..76dbf16dbab 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 8773f6c4ff4..3bb26102b41 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 2cc56ba0579..2324c5a47b4 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 7096451e8a9..bf19c533cb1 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 31d14a51203..7be89f4c6f8 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 12a2f32ecf0..820f0466ad6 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 39def47e240..4939b8eba51 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 02db27173c8..5eb84146a17 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 c58822feaab..61aa1f0c9ad 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 1f5532ee06f..294686b22af 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 d46ca719bb8..a92c5ddfdfa 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 76f8a291358..967817bac36 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 d3645c7ceaa..a7e313ecf7b 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 fd491622f12..d27f9f76063 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 c94d8f744f7..a2babcdb02c 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 97b88c1b0f0..87231575067 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 aabd8a68df2..29d2694ddba 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 dca5b9d5f06..33883fa24d2 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 e7f5f6d7258..34b10af3440 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 4965d599baf..5334b1da85a 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 230247e52de..3c7696108a5 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 5e1ea1a7d98..a9d3f14adf2 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 b10de85f88c..bdf503c9ed4 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 1a6d501bce1..84d4e634cf7 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 12794289827..8692026fc48 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 87991b532e5..16ffec717f7 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 ed563ca4999..ce7eb49a641 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 4f0c3612870..d1db008416b 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 e8f79745770..6abeac09b7f 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 0c5f406b1e2..c88177018be 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 6ce6ca0306d..ee52e21c72a 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 8cc9598e572..a4f670addbd 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 0c189fd765f..abc33e591b0 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 9c41db3acd8..699188290be 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 91532db8c74..e24e393f8d7 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 9da3dfcad6b..256dd63ba39 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 de65d0cf358..cc9a695c866 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 176017c86a8..bbeb9e4fa8c 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 4d82e5f71d2..95cd1887d1d 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 8a6392fb9c1..752ebf54eaf 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 acb94b4db0e..bcf6d8a6de9 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 65bdb421a56..334a0d0468b 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 4135f98d975..98712fba3fa 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 b2b2c5556ce..d8a318dd934 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 9427a1cb244..9c3c1b62268 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 4be6b8d1e55..eae951027a0 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 3eeb3eb7500..d37abb22e05 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 e6155373dd3..856c4ed85a2 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 f1301e02930..f80fc0ebc63 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 c8073ecaa14..8339043dd44 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 9e955f7ca00..3c0e0a34000 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 d3f901d1f07..64bf3a8d824 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 48f12e9dc8f..0cc30648642 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 16604420948..a3e2cad5166 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 e41d4bdceda..95b58132d5e 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 7a9f9720c1b..66955b906d1 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 f4c57351ed0..2141e57e2ef 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 index ba24e90eb53..b4906843330 100644 Binary files a/ext/standard/tests/array/array_values.phpt and b/ext/standard/tests/array/array_values.phpt differ diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index a26a767b402..0a874d2927f 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 07d682c9e1e..40256185a12 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 19b2fb73fa9..19d45ee54bc 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 b939354da52..81e575494b6 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 69359b409c0..905dc52ad42 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 3fac7b44c98..8aa54f921d8 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 4fc4b011cf1..481e34bf63f 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 b4ead80b3e5..59187c7c7d5 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 cfa600c3c50..99866bb06bb 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 e4bdf1b895f..bb106b1fba9 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 b1412f4b97f..ee5b4e9925c 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 334dfe4ef75..fb77e92e8a2 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 e39320d1ecb..a4026180fbf 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 fe51143a602..cd06ea30965 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 1be79f72416..3994269378c 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 df192b6a796..606861565c0 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 40d5e1eb2bb..ac5c35440f1 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 75966e8833f..b149eecbfd7 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 8b5e92a0e03..b162a1c9dcd 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 d68d1554dc9..0bfbeee0676 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 42855b0a686..b379e663fcc 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 105c1af4f14..56abaca83da 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 bef44b59ad6..5c8c56dcc2d 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 2db65ff20f4..a6d623b0111 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 a7cf93bd9a6..3540421f2cb 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 4db59895828..ce85fe7e4b2 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 fdda0659041..dea712e5b48 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 c07a353d38c..06dc1aaa090 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 671fcdb375b..2db8067fe09 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 46a58fa53b8..f436ea206f3 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 e1698ab4d60..5fc3e62f2a9 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 5cfee36cb42..1780f66bae2 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 34d7a8c2ec6..ff466e52801 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 c495f2acfc4..d141bc20f72 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 c80cfba44f3..e36ab88efc1 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 5392618c170..8fe16362aa2 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 a411ae0b5c8..671ad44309c 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 56a60e6b0f4..829baf1add2 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 5f82ab65d80..e1bee479982 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 598fe6aab3b..4f63b6920ef 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 676d8265ed9..5a24815697f 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 40db0b48179..75cee2de5b0 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 1e674ffd3a0..338c8524462 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 947d8f07a9d..1310590f561 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 093be7e61ce..27ab476bd9c 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 index b669cf078fa..aa6f33ae6be 100644 Binary files a/ext/standard/tests/array/arsort_variation11.phpt and b/ext/standard/tests/array/arsort_variation11.phpt differ diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt index ede832f26fa..9f8d47f47ca 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 b52d3a16a2a..d572e4cdaaa 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 b8149c66a66..ea3fc18b7c4 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 ff85223ef41..ff4704c4042 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 d65f11ce982..3c8b6206c2c 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 1f948092a9f..a8daa349d45 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 61c532e4d88..07c7f1be510 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 03c696499b3..96bf4694840 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 ef2329585bf..821663fa641 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 414c89086cd..21984de67e6 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 dc5c4b95223..8f2a6661462 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 6ad5b4a6ea2..4594a3d171a 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 3762ce04a54..4b9ccd2f516 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 index a1db5cbdf76..c32c96cbf63 100644 Binary files a/ext/standard/tests/array/asort_variation11.phpt and b/ext/standard/tests/array/asort_variation11.phpt differ diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt index 1b201a9c2bf..4ad106b6583 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 088e58a3da8..6dd60e3e7e5 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 bb0581a6602..c7ca503aea8 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 a25e96fd64c..3d879c1b3b9 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 a32c0de8596..892dd822381 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 d53fb0d21ce..ec022246173 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 f3c27ef94a5..f371a07daf5 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 abe73567ec2..b2d133ef13e 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 66bbc394d66..4c41607d347 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 91c5b080a9e..fbee975d17a 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 77a78009bd7..9216ac9ba67 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 273e27683c6..f5cff97e0b7 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 edec9fbe3f7..175cfe71180 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 f2a6aad78e5..287a4790673 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 970c7d40457..d7fb0dccb11 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 index f1b6f76ea6b..74e571160ea 100644 Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt index d061ec65b7d..cd38682dc70 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 0806bee674a..88055ce589e 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 ddb196f77e3..a9e27cf3f9a 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 879bc124d9f..e3dff968ff0 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 63d4ded13a1..8a0773f0b57 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 14b55361353..7cddd3e5c3c 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 b6c39538a32..b06e344eb86 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 ba0f2657c8a..c36f9bb8810 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 adf9fcecdce..dc3f2eb75e8 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 cbb5e0332ac..6b9e07ff745 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 2e925870689..b14cc2f8360 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 96e84295588..9673a128ad6 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 259c55b7479..2b7f4cd9d4b 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 ea9c336ac0f..43972b751e8 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 cbc30212cda..fbeea68a129 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 2170b4f6b47..078a7e8c407 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 039d474f898..c8238050ae4 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 72ce83e6752..a0dcdf96736 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 17f2370947b..a858c597b5d 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 50661938102..d755a6a214f 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 d9bee0f2764..91867b11125 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 193b976e942..cef3fdf4462 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 317d153625e..bddffa60587 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 d32df1c7484..0815e3ee94b 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 9ecd334b9bc..f07d1dea899 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 eeebee978d1..186eb2718d6 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 c626fd68720..2b45124921d 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 148c4d8400f..12a97e14211 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 c34a1154c79..cf7ca37531e 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 916e99af384..2d5387e56e7 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 6698d6385a5..a7fa8d7bf97 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 ad7b3b97871..16b7e0ca4ca 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 b28d44c0578..250d9da03be 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 a1ddd8de29f..308be2cc261 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 102e6fd1f7a..c22656d1735 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 ee97794bd5f..95080b55075 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 cc3eabf1e77..506b0cfa570 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 5643b39f58c..dbbac1e85af 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 da5b047e241..357fb5c1a00 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 b12f017eb83..14a3310a652 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 index 3dd33157ec8..67a402a8dfa 100644 Binary files a/ext/standard/tests/array/krsort_variation8.phpt and b/ext/standard/tests/array/krsort_variation8.phpt differ diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index f3e510f8bed..53172289318 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 59241bb6c8c..66b213d8c9d 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 f2b102ae014..7631e9ee0ec 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 4678b5dda8d..e1930327888 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 2e08991d792..1a1a719b535 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 243e3b171fe..2c93512feae 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 57975d8c281..c80541ea27f 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 e51ad0a85fa..3159a36be5d 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 48218b2eda3..0e6d8fe372d 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 6c7f3b870ec..4b1f509c3ce 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 index ca9dfdbe9e8..bedbeeed7c1 100644 Binary files a/ext/standard/tests/array/ksort_variation8.phpt and b/ext/standard/tests/array/ksort_variation8.phpt differ diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index e78ea3bef00..be58e6d5890 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 ba233535035..539fa424fb3 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 1f836df3c27..531f4ecfab7 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 index dc5b5f4203b..7b806f39779 100644 Binary files a/ext/standard/tests/array/natcasesort_variation9.phpt and b/ext/standard/tests/array/natcasesort_variation9.phpt differ diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index e502d8646ee..2813f7c5144 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 f7b78357cb7..11e7cb12ded 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 e5ce1773758..405f34a435c 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 1ecde7efce4..aff03a619aa 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 f3c91cafc38..8e1703259ee 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 bea245196ea..0b9b15814eb 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 851cf0a9499..37049cf854a 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 dfac24eacbf..8f91507131e 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 1ac902b1f43..01156d82394 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 8e8ee4d6732..e4c707124cf 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 52e3cf55f4d..04c676a4cf9 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 c71608112c3..abab8af635f 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 ccdff248bfd..f2733249023 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 6ecc1ad6838..e155cad5923 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 7ac859c1c35..ff17a0cc9e6 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 0d13a48ddac..e838a9ce92e 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 6f6f2f97620..247ec79cb25 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 2c0b5711368..dbaf1751f00 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 f3eecb7fef1..75a8fbb7abf 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 87e89774876..ebc3991edde 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 bcb184e84eb..eb1326a546d 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 index 076a9065993..5c851b4c4cd 100644 Binary files a/ext/standard/tests/array/rsort_variation11.phpt and b/ext/standard/tests/array/rsort_variation11.phpt differ diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt index b6e423111c5..b6b9c68bbef 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 ee740fd2a60..dbd1a27820b 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 08ce8a66d5a..75d8c8bb56b 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 a8555ed0d98..2821d212241 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 d593573adb4..71280710d03 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 14eab635d0b..f6f92c7ccde 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 49b600699ea..2cf8dc77f5c 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 9d0d917b88f..d3b44ec0bb6 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 d601f5433c0..e29dec92202 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 cb127d23ef6..8977e349f95 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 833b3903637..27bf2609495 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 2f578be11bc..9a580959e8d 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 b43572d05a0..b0394338ea7 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 6e456459d61..68dad4a4712 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 72c6487af5e..2b5f80b71e8 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 0479a8f817e..e7a7db1be53 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 e7fa988373a..c292199cb9d 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 6b96863ab49..a76e54d70ab 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 c6274830cfb..3a9ce1b6293 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 1976c78c1dd..c81018f6358 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 4f394c2fdc8..e98c3342671 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 1fd024ec2eb..1bc815d7c48 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 b78b620d7d0..cb77e07323a 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 983be5bb563..465b8181745 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 89fce6631cd..905505fa060 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 fe5796c37fc..1f9c8f099fb 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 5337388b17b..7c7ecb11056 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 7c0be406076..a55a0962a8a 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 026c45b8523..7e13cf8abf3 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 5bcb95d8600..9eca22c680a 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 9f76968a034..1ff71a3dc5f 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 index 4faec0196b8..0806ab68166 100644 Binary files a/ext/standard/tests/array/sort_variation11.phpt and b/ext/standard/tests/array/sort_variation11.phpt differ diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index 0fb5612333a..02e6af21af9 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 4515390b208..3aec6dcdb14 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 f4f6d783c16..56b25223bf1 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 0395d0c97f0..f5f19874585 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 cf094e864b2..7d7fdeb4103 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 f61ee46e541..48d4a48758f 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 9e8cda117ee..87134716ca9 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 53e5679600f..bf7d03191da 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 c0dfefd8365..160af2c328d 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 de0275c15ae..af9c624d742 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 cc2dd3a2175..a517e4a511d 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 5c981fe0382..c357e074909 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 37ba620a5d8..26fa6f11b41 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 1e5d9ad6e1e..f3a849b9380 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 ab54a110941..7b6188b4208 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 c0afb8df5f3..c8d3a81d839 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 62832454106..e5278fbab75 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 index 8fe5f278214..bcb5d41fabd 100644 Binary files a/ext/standard/tests/array/uasort_variation3.phpt and b/ext/standard/tests/array/uasort_variation3.phpt differ diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt index 613edd46847..75772442a8c 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 4b353dfccf6..b398d627093 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 46d5e24aa41..26eb1e1dabb 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 48028dbcd88..72520b2eb83 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 dd0a7a39136..2bb2b465125 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 b8c5598d843..38aa32b2e5a 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 366a640c026..db9fdea0887 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 079cbd6d771..21210dee7b8 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 610fa73d063..5ac32f02b86 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 64351f707c9..f5a8e7579d1 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 70c555e3466..222b9c62a65 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 7bf0f659e03..d0ccd362215 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 0e87443d1c0..8fccc490472 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 00d302f35ba..3226741da4f 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 b66a957bc2c..18673f02459 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 cc88e334d6e..be5a1b0969e 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 70d21649ce0..fa5d463ade5 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 bd7666744d2..88ae8afe4b0 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 b358be46d98..13352797087 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 cb9efcdccc7..b8660e1438c 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 10b1e9929d9..473f61a0dd2 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 55c4efa0372..a493ac752c8 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 2820d50d2b8..ab3532e8a77 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 90604802098..8035c57b13e 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 3f8a0003c75..08e1188d60c 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 50c69e8ffd9..80c42df473f 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 c8f58d310ea..7303dbb23fa 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 7d92ee31bc5..73b3e732061 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 4ba67dc9ddf..a5bcda3316e 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 6c2baab437f..e44c9a4c6d9 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 8c63d43192d..1ea52b0b9e2 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 aca46a594d1..87172c9b60b 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 b092f496c29..b95efecd65c 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 4386a762029..0c9a1214700 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 1d9cadd125e..561a77fa2c0 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 1be10387d48..4b77d032ea3 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 ea2b3a354a2..af6d50bef26 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 d808c8441d2..34814aecd4a 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 e214e0f4e5d..b8742950365 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 faed0d4c7f6..e5e94e1c28c 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 b86a0afc034..a77f61819af 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 b053d6cc69a..9888c26ae02 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 37f9bf3ba57..abc23952098 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 204398141fc..e6e43056913 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 9770eeb099d..ad7b6563824 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 4aaeb78d618..5ade3f240fd 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 fdf5b48545e..0e54864b09a 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 4b89f2971be..bede42a7622 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 4262d34490e..7132410fb86 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 4e9517b660b..669378740a3 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 1d3f503da1c..0fd665b250b 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 6de6a42be22..1b11981492d 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 fa2204b02aa..a6978c6d301 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 989bb094f09..27962d6c56d 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 3a5624aa257..522ad36a1b6 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 e9291e6295c..9faef552419 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 aff6357031f..51a68db2ef1 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 176b149e758..9d9b67cb675 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 48c89ba8fae..c25ded8bb2a 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 2fe1d60f6fb..edf6815083f 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 7c3ad7b0e13..8c7cabdc6ff 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 e42d359038f..5ad775ace32 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 68fe1703908..ed0644dce73 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 52020edc190..5102220136c 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 a64398b2eb7..8dde525ae82 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 f57405d5dc3..312665267fa 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 4bdde8ba97e..f265d0085cf 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 ecd90e91993..1f9a0af422d 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 86d10de8870..ce66ca1b418 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 95059f8247e..17ba97d85a9 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 d41d37b44b3..1f726786370 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 9bd1023c52a..563195cd0cc 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 5ba2c80bcc5..615a45ba339 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 1ee193a7c8b..0813f28308b 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 3224e56e9e3..cd5b3b44a69 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 d2f8f0745b9..d65bfcbc26b 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 150ea3da9c5..a7ebab59c54 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 e77de23a1ee..909e2bc09af 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 4d2bef3cb36..0a4c5752580 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 282ca4a4f6c..2898dc7fda9 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 fc64ee49a94..f9c8e7e2c4c 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 7714341c87e..e92b7a91353 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 1f645d6717f..de1edfe04a7 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 aa7e1be429a..4accebe20af 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 e78181375c0..ad97d49df7e 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 cb0e0026d61..5876cfa9bd4 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 4d51a64507f..e4564cbfa81 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 7a88449222f..4b0ce2baff6 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 c865705b14c..60880236d89 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 d47ba7ad46b..708c6c91e4a 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 a60788b53d8..70d18513dbf 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 39a843a167f..b51126c1ede 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 bdf1e2cb825..a4a4a209ec1 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 8d5b2ff9863..3cd5d71761d 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 81d3c7c9d1a..4e189880760 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 0f57ff5b2a8..794bd5c7570 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 2b23c906445..4f6272ce4ff 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 a3bbb63e6d6..6c322a2e3aa 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 0383410cb74..5b9fa164864 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 bad543fa6ee..f456f1e1a76 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 f28d57ab4f6..0d67b0fbc35 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 9ca6a977487..097ab56e00f 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 2602e292ff6..8515756b175 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 49080bb6a2d..2ef1aa7814b 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 04c614e33df..e5ca80b7d25 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 c2f7647ff94..b7ec7e3a790 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 9e46f114fd3..b80837194b2 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 26b4a5b8b70..f46a99b8727 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 2437868d629..303d47c84ec 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 b9b5e67e7a4..7d7fdcbf0e5 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 6f14188e8b3..5bdf181b507 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 b6cc96ddbb4..91dc5047131 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 e26b925311a..ea040bed8a0 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 9d24e4ac1a7..4e7bd13f2f9 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 7ebbaa470fb..f3d2a6d1d47 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 ef720d09596..f09eb7165ab 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 153f3036779..1fcfa47a9d9 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 f9d06bfdb7d..ab332d05e21 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 17ada17ea67..373d25c470c 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 e363de48069..59ab389e10b 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 92b8eee1bd7..ccfed4bf059 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 1c724097b09..9156585938c 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 d3aeec213f9..e5b891f5fad 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 ea75955035e..a6811eb5eff 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 74d0a6b9828..6ffd12aaff1 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 3de0dd3701a..1e9a62f3941 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 901b13c4a8b..d77b1156c30 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 b20641740b9..3a42c8d9c1a 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 f9bb38c68ec..b5fc83caba0 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 df9fcbb75b1..caca6a05046 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 4494772dcca..e16235ba872 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 c16da417e2f..a75859b9fc6 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 90cb81a27d7..f9a7db632dd 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 572a9a07993..c6d1d79d792 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 9938c71f223..21eaad4b067 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 88cfb7a9fa9..24fbad37a9e 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 25efaf10bd1..47e00c4b766 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 513a22b0ccf..31e52c1105e 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 ac6d37aa15d..38965872b08 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 5be20d93c22..1b3114c550f 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 eb6c31d6ce5..1a7566c5479 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 61116ab9c2c..1c766a51d53 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 d831394e8ae..acbb8f32abb 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 81b54139a8e..0ed40964a6a 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 f439920ada0..fc7d0f78c5e 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 0da7fbd8bee..889d96a387d 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 bff87ced0db..2cd23b8bfce 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 bec721d3c56..aaf01aab098 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 2d1f783f575..3571808f85f 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 bc107704a08..9fa264ba4c8 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 b3bb02bca39..2019c4a457b 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 833da1c5c57..3007e43adbb 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 a3f5e8ecc9b..b8f36d7eb22 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 6b06a56d950..aa186412921 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 2a2af89e630..a1ec7f80d42 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 f1cc3e11c8c..14e9405303d 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 668f659851d..568ae5a5e2c 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 6c1ce72a445..dcb15d46a01 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 7fbffba0cc8..f603b696c93 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 b5bfc28c8ef..2044471c66c 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 dfdd0509cd9..6b664a2d2e8 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 e30994261fd..b525e3caed1 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 958079dcb93..0fade971b41 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 439d53a4df1..2039ef33e41 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 95200649ed8..5bb26f04831 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 3a5391011d9..ffb0284d95b 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 9630373b76d..567bde0af75 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 73064d779fa..f415f13ad27 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 09dedfffd22..ffffcd5069d 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 0835af07135..a17e8a5d357 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 0a528466a45..c4467d15363 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 63fbdbf4230..6c77f69e4d0 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 ab6cb110360..9fead1e4550 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 73aa60f11fb..9311d030c12 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 031b4389af7..022c1e5ba83 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 0435a8c3f34..8cabeb5e365 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 d8bf6c5ee92..6ac22914dbd 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 30c627abf16..68fa209b24c 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 510560772e9..f2bf19f6a33 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 000765ccceb..63b3c1db67e 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 1a7160a77ad..f365174a845 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 04cc274ecc3..c35eba21287 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 ba29a175092..410f923a864 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 c4649cd4a0f..19bbf60fe9a 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 38461df97a9..9fb473b3683 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 2b315a5cacc..93a6a23e5f5 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 cdbcb0bf3ac..2731b3bdc97 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 f75208e2f20..3093535e642 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 b8ff42424b5..68b8396639c 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 21ec9f93476..242b38cadab 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 fe299325be7..92ec32eb22e 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 c4ae4b9bff6..87bfc45c493 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 8c0c690f92c..43ca4f78ffe 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 828a86a6ae1..6c6d22f64e7 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 c5ab431fe9e..6c416d11031 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 1e23976d052..af07d1652ad 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 f9751cb0c86..d17a89f64f0 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 dcafc4a4d2d..c48776a4cdc 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 d9149676e9a..716dbbacb72 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 879190c399e..5d9b1ea2128 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 188b178f225..ebb19a0b2e6 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 8c9c38cf7c3..d456214c279 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 fbe4dd8bb24..26c5bb71529 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 91acbf298ab..62d7f845686 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 b81d13f257e..106cd4b6f4d 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 892666b8956..3c8bd2ff488 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 200a9575a84..b9c819f0a5c 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 aa27db85c06..b2a276cacf6 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 106890c0347..417974d3be4 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 4c84f020b74..4c54f473b20 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 cc01af149e2..47bd3628d4a 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 e2d97704add..94740415810 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 df97596757a..a57c76bd675 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 017f4a0c5ff..7d8ebbee912 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 429030ecdee..996b060ceac 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 index c0e7498f14c..a9b4389b5a5 100644 Binary files a/ext/standard/tests/file/basename.phpt and b/ext/standard/tests/file/basename.phpt differ diff --git a/ext/standard/tests/file/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt index 18984f04512..3a123029c06 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 771a160cd24..43d6de50609 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 fd41d89be05..195b98a6d39 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 cce732554e6..684e538d768 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 487c2274f1f..2bb94870dfe 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 a68d5728d77..d1ad6b65264 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 03535b070a8..3b234c741ff 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 9f3ae0bae7e..13d2f1f6676 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 2cd4b8c9d71..1eea8f65cc0 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 7cf20fd7494..aa1584b98a1 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 7d44d94ec40..289118240b5 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 6eb8fe3ee40..1c30d361a08 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 07a54075e19..6f8e9dd51d9 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 e36fee1d666..1ef9da1ae69 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 9e7ee25d3b5..73ccc718407 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 66208082c6f..cfd28b7e664 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 28f86532c9f..259412f4603 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 2d81751272e..999c7123850 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 index 47152d4239c..f856d1665ab 100644 Binary files a/ext/standard/tests/file/copy_variation4.phpt and b/ext/standard/tests/file/copy_variation4.phpt differ diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt index b860332b069..1245191806b 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 c480fcc3bf1..df13f4bd1a7 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 524b21d377c..9d4fb9d9c9d 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 3213c6b4368..2ce9bb30727 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 805fa9dd13c..e67375dfb5c 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 34d5b907d97..e2817aaef3c 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 87f85230b54..1e7f016e7f1 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 3463fcfe68f..bb53255fc82 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 9b243899766..2ae0c82c799 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 9c41241c45d..4181823b92d 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 7c603be92ea..fd7aec12107 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 4cfacc6ab0b..9dbbea4e314 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 21e7bf653db..27a1c0def68 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 ab2ad090812..a62954c74f9 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 05c2153f703..e59079eac0c 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 cfef2a42452..b2cb79edfd5 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 a3ea183194b..3fe54b53204 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 b60ad6048f2..de37851d267 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 5c2a2c612e4..4e94774a740 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 78774e58e9d..2fc2e4b8553 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 9679f4dd00c..32d66572089 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 5716a56560b..0d3dbc6ef14 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 d23afd8984f..441ed8e2995 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 80bbaf54f34..defce241590 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 574a798e298..9a0040ab734 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 4c6daa4e7ff..01f01f2361f 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 c86241a976b..6635e8d5543 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 982433f9566..d444209af42 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 db4ea6fc21f..aab7bbbf8f9 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 8f3fcabee14..e3380e00985 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 e9f029e767f..5fc8108a623 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 93c81640d55..41388fb00ce 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 719cbe5708e..c555cf532ab 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 9802e921204..6ae6ae61b11 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 d640244b896..b7c7b6b3737 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 b1b588e552c..44eb066e9ca 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 9ccb247b31e..212f197745d 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 8cd27eccc61..4768cf27705 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 61759e0a942..75cb1c5ced8 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 932858bc984..a5889ee77d4 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 7278b503aa8..5200b5e8e1b 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 b6961700368..40fb910cf94 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 49a32d92df2..5027d13a785 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 dbfc2849d83..6acbbf4f886 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 5c3999b0d73..ed4e129eb51 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 84c0e0bc8b2..a9b51f06a57 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 9ac3569b9ee..154c6f91048 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 6dcb6474eb0..9ba0aa15ed2 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 7ec33e6f227..53077f3372c 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 15133aa870b..ff10286b4cb 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 1b1667325ca..4facbcf1ea9 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 e2a40bffd1e..df4ee6c6f57 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 ce60f32f006..20507973db7 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 caedfba781c..2cb570c8dc3 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 3113880393c..d4e3d8a43d4 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 7eac3ed017b..e42163bd982 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 b73b7aa40eb..ff18d6fe13a 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 20f4a3b5cb8..95db326598c 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 247d450cd3c..2854dc766fe 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 51b6fdb546c..cd518cb1441 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 72d82c7988e..dd0d788f6c0 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 60a57a8daee..d5610ce1abb 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 048278cf5b0..2a537b29a83 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 b4a86250ba1..3e7eba9fb18 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 4c0ba2894cb..fcd85ce6e01 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 6288477fd45..8a64fbcbb06 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 788a2a5f374..b1e4a89c647 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 518e39d4c94..41ebf8e1da9 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 c78fed27c1c..ea76bb8a8b3 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 4dc1fe3b451..d77689d980c 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 6dffe554b6b..13a53994069 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 f12127614a0..b8ad242d9e6 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 9f9fa1a16d1..6166f8468cc 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 e9d19a7a263..228d476079c 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 9f61d23fc07..c1777fc4954 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 1d7183a9d7d..53a2ac879c3 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 cd87b8bc25c..91470e1d443 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 77cf9187492..57f1fd90590 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 a2e3baf22c2..e6fc15a98c6 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 dd9a468e57e..2456b80bcd2 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 fc7a7487c47..7d98e4d0a5f 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 9a3122fa074..697f8334caa 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 694f9303527..0cdfe5c1971 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 63fe4ea3655..24f1615afc6 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 28a66067a32..12bfd325ae7 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 6142386e63a..12d740c5f01 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 a6b99be1b31..9e8de27f3f8 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 5272489ae1f..3443a4c62e3 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 cd536f56170..6cc2054589d 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 7fc63b4d9e2..d0b74757d20 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 b131a4bf54a..f30cac10d21 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 ad09ffb80f7..27ddea0060f 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 2217789f09d..baad767d6f1 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 b762e16165d..0fb662b0a81 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 8fa50a7b02f..4928404098f 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 7034efa5035..97a3495d543 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 b49935a9487..f4bef2ec357 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 9091c34ded6..b6f8815cd0e 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 846517d43f6..ae56486d5fe 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 537ced2d912..6da2c0a4165 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 7c3650764d0..339e9b73a7c 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 475981b3efc..7f963a01fe4 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 c42bf39a840..d4ee0585fdc 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 4f8f5232d50..94cfa627d3d 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 96951a44199..095980b5362 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 index 3cd92c5ec8a..20a2861bca9 100644 Binary files a/ext/standard/tests/file/file_put_contents_variation8.phpt and b/ext/standard/tests/file/file_put_contents_variation8.phpt differ diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt index 5ed3ba34b11..64a5a67e33f 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 f1b22283fa2..9c3ad0e546b 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 395047567ab..014adec6d8d 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 c5c2342fcf6..103c2b0af62 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 1a189164f55..6debeaac7ef 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 fd0d98f604b..b4f1311ef09 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 59e5cee8b50..415150dec0a 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 63d1f45c2f9..5a11259b6b7 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 3dda0c92503..0060e66f554 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 07fa39bd9e4..888fca546b7 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 07fccac11e6..30d7475fd81 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 ef9ef34b5ed..d8d3aff27aa 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 3b0d46a95b5..132ecd7e9f1 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 d42a276f991..03794516606 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 8e7a0a12897..215c7676163 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 f70b84e6191..604887d1165 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 0893b81f2f5..f9544018919 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 59f8df9b775..f0baedb378b 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 05c18a12eee..9d1338481db 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 0cb1e7361a8..b56c19065d1 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 b9652720110..b49a5286c67 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 e09af42570d..b6b306a37a9 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 400a74dc4f9..1c276a2957d 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 5b453d77887..eb82a4d1495 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 154b41e4cd8..ddfb136f64f 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 952a4d91055..ccb62747569 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 dfb442086ea..0fd2be46068 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 5277874ba67..61ddb2e09cc 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 cbc405eaea7..b3607be58b9 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 1d533a0b87f..451979e45b4 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 b21b4221669..00c2c82caae 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 881fa774302..e39ecedf874 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 94dea212502..76cf084029b 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 73f00a45963..8c4c23fb30a 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 465ddbcc862..b62bedfe68b 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 88a450b735c..0dd3d23857c 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 58184edb36d..3dca66841f0 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 82b259057a1..023586c3968 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 b0345236094..429650564bc 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 ad1bfb133c0..069ce111708 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 6837c25ce2d..fb00b243fc6 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 a2578a700dc..15f9e60c5a3 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 7baac85e01e..ec33e1f0bf3 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 6c354c636d6..a3ce051deb5 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 9a4335c410f..9cb40a00198 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 692723dd9b3..b823709eace 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 db46ce008e0..bee941eb945 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 33b7d3ca4f5..080549f03bd 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 4458dbd124a..655e2395b1a 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 c98d49c6ce5..7cc3d351c73 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 7bc9823fe25..bad44ea0c3e 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 f509a277384..69fcadbfb6e 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 53694789713..83e80adba2f 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 d0b5c71c1fb..f1779656860 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 6984614e491..0518cb74352 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 9486b2f77f6..2cbbf517ede 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 60fabcac7ef..5cbaed0fdd0 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 9712e8086c4..f184ffabf25 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 7c8b44e93ca..02c7485d7ee 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 aa2a764a54d..49f6d81d104 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 326aa08e9da..5de601707c1 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 fa85f4f7e5c..789825de526 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 a2b975a5409..74c10852d88 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 7852806a17b..c4c560971a1 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 e4ca59b9163..5f009f55141 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 44d2fc993c7..1c4068cd972 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 12c66ce928a..d930e55a71e 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 ce5abdb1031..4066cadafe0 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 1109b4813aa..a0c9320854c 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 a176bcd6dba..a25feef5e73 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 de21a444598..e450437cb32 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 9761af8dce0..af5f5e23299 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 69ea1574ade..6c6ad7ec180 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 dc893dd509f..aa5ad51ba4a 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 eaf720c506f..e4217920070 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 e31e39688ef..9ab441610c7 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 2d6debd5c0e..7b5168011fb 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 d979517a999..89da5567f40 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 0c521a21863..a49e8391df6 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 8c49c0cace1..df4ebaa4760 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 d7e84f8d8ca..899d5580576 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 680c4afb6fe..0cf07076fe5 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 b91028af075..b79b96ba4e9 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 81251c7b81e..421f75067d8 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 bf6d97515fb..50bb9e0d1da 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 fc36f5da367..d429377e706 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 c5f7e9413bd..c8391d8388f 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 aaa631de811..788427188c3 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 24f34a5d81a..3e44d643eef 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 07e569be1b9..80b52654dbb 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 5457c9b2c6c..7303454175b 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 f7d3cd52368..b1f0b248b5f 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 6dfe071418f..b1a2eaa7036 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 88e86b9690d..0e98f95022e 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 864209f4998..3bf065fde0f 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 4860ee1b5ed..58327b867e3 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 222d6a2b8c7..42a8c515d81 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 4b5ae3073b8..b1ceb085f3a 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 1d1afa4a561..507eac335cc 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 0bfa59b8b53..fc8f8b89cab 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 0b720472aa6..fa51b5bca43 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 703863976be..533b200c7e2 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 fb165ac068e..cf30d4b9c23 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 c668dfd5160..b2412fa9b83 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 5528c15a688..a39d0b8ae11 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 f904f61fdb8..af406a147a0 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 68747729aa3..46663364d07 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 3fcb8f5d18a..974ddef8f1c 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 aa50a8140a1..3cd273488dc 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 ae13100617a..72ba7c84a27 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 1e02356c6b4..ef34fb16d5a 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 bf6afea277e..64661938207 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 e81b7133519..aeb7eb78ccc 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 ded2f648f94..99324ed4728 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 c9b46bfbb4c..79d565d3d1d 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 9788b020410..79bbe5b50f1 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 c33e28118b7..80228bbbece 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 4212751e620..54df01e7437 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 fa6c14965f3..bb3f40c2205 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 b1eebf9f7ed..d6c5951e837 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 44afc314ea9..dbf579f516a 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 890b126118b..946b23e65e0 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 b9fda93f1b9..864e7eda498 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 9451c07f5f5..83c6e4dcd6b 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 d53a43816b1..16aeb39dbaa 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 8c3f53393cc..3869e35166e 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 9ac2c128c57..d54c46f32af 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 87a17039816..28b52da2064 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 56b2d128e84..0dda585822b 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 48fe1802a8f..2a489358d5d 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 99d6077b41a..b40a08cc9a6 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 index acc4e8afa30..67b070c8363 100644 Binary files a/ext/standard/tests/file/ftruncate.phpt and b/ext/standard/tests/file/ftruncate.phpt differ diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index cb4c6e2468d..3cb6db27f83 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 7460492cce4..abfb8e68886 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 317e13fe73f..bc512aa5c89 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 5a84b168de8..426746de8b1 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 376f775dcf9..cdb77673b73 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 5288344b20a..38f70cb227c 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 03ecfee483a..e63e96c38f6 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 d1655a7b6dd..be6b8e758ff 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 3670edd281a..ebbfbd1ad70 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 ec2305a6b1b..cc0ead07f08 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 dd3f5eddb9a..5e2c0472c71 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 a2e2d8d9e94..f2d67c19fc8 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 6f16deb2d7f..82061a019c0 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 b04ffd75ba2..3edd3d6a5a8 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 c7e148efd14..9d1c16af2bc 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 247ee4e13a1..bf50c4f9c7f 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 701950dc654..65268afdd40 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 b12af3182bb..7afa91216e5 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 d7b4aa57f5e..ecd47f418e5 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 cfa140ad52b..76b8e8bc0c7 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 41826ad7ecd..20703741177 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 a93cd6920ca..2e6d60593e7 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 9f494373118..1cd0a8d209e 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 6edd2dd7449..36399e189e5 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 925f9963c09..b9f734d4483 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 e3c230b26c0..148b89a674a 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 f1b8af55d64..0ba2324f9a2 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 dc4d3b16f39..3de5f1623ec 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 ff717a5c2f2..f5cdf6a8a0c 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 66a80abf1ee..6b79934760c 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 1d3604e3291..329f4b94dfc 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 1e1ebf3e946..f4b4f5089e2 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 0d1476d68d5..ec11e2f8390 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 cf8213a8e4a..ca5f3eaeeb7 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 e190f465aaa..311e1384e84 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 a515058421f..101bb6005ce 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 6ee563d6845..4ac01f20352 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 8dcd70c7981..ad0f586f1b3 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 b828c855a36..17458d9107b 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 3d5cc218ab8..c9ac88334fb 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 d799befd60a..cbd5c1a45dc 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 3c30ae914ee..7a5aa4d498c 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 ea02b62fabc..cee03858cb8 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 93e7f28d322..c77c66b5312 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 220820532f2..51a1c39c176 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 cf2911273a0..4c037b6bcab 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 acf7e27eac9..8be3ca26058 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 c6bdc1575af..b805dee3bef 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 d7646a2a4f7..ea60edf42f1 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 88633bd451e..d66f179accd 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 49636b1bb12..29e022fb13b 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 4e76d5133d5..666ea433b1c 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 09e18d8c0c8..e7b90917376 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 c0a3bd777de..96d44433f70 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 5af6631804f..e80c25822d2 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 2dbff797010..5fb76b60046 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 b7833fa2e87..432441ae6e4 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 8b5f1a5b6ed..7d5b650cc3a 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 4726ddafb5d..a4f24e4e13a 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 2adf90bc94d..acca647a973 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 ed2a138c1ff..8545406e51b 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 75ad224de85..36d9bab5ae3 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 38d05b50b6d..a39543b18ff 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 01fb0a73770..b8509dc8ecc 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 3fdba4cf12e..bc12266675e 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 b321ba3f380..6eaeec55e28 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 ea82c7781f1..53e7df1eee4 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 812a24e5ff2..7aa879b48e7 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 24a5af8ad8e..a240a826b96 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 index 3bbc329f317..59b92ad3658 100644 Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ diff --git a/ext/standard/tests/file/readfile_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt index 854642a36d1..a22b2b40442 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 48a3c3084e2..99ee79e40ba 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 7afe9ba71b1..bc9c0640551 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 1a87ac785c8..dca6f4df673 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 9f6b145ad0c..b41721ae4f5 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 1eecda46191..b4fb0bf3226 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 c4672041b9d..dde7a1ec7ad 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 dca4d4a794e..cf80caae996 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 ccf0ded7f51..ab1d9557781 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 f4a9c554ad9..c7add6b0379 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 fe3057ad19c..0c8bdb87e5a 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 bc3ff2123f2..828837a84d3 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 c19aeee3439..2f25d193f5e 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 519801fbda0..46a47c3e94d 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 74c59884919..2998189bf2f 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 1ba349899b3..8ee59168b10 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 f46504d8fb9..e940f780703 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 9a1367cc6ae..064daa4dfe4 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 8f3a65acad9..a423496fbc9 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 index 51e14833fbe..6319d4ad619 100644 Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt index 29e13efbb80..2686150f23c 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 c4b575e922a..d80a939b336 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 e352b7cf0d7..8ea2499eed0 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 7be25949f60..b3a1797c7a7 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 6e236c376cf..2026a249bcf 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 9e55ab43c37..5a958631d98 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 090d52e5342..0556266efab 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 6dd30f58e77..7555200344b 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 da9afbb9189..2418ccfd5f9 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 13dfbd3f998..fd700a00620 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 0c45f5d22a6..b25b38cef58 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 9eb36208ba5..80ed9431887 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 d49f5244f73..f5c0a9de1ff 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 0dcf271d990..a8e1a03c8f0 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 416e6ae323c..09fb35c973a 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 837bc5b9616..12e5da17e86 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 dc353e50976..edb2889d415 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 9c0c8ab8d02..c69d2d2b045 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 e2f30cdfda8..d7383738563 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 82ca75b64d0..df63dcfc5d1 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 aacbcd4b3fb..8a771b27b9a 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 339ac7c0a98..3e659c092c7 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 e57b677a2be..a571a7cd5be 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 8d62aef2ea1..dbdc396656a 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 b7837b68d44..47da53df013 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 fda6beda6bb..39f1fb0053d 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 285faa46a5b..40999fef47a 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 230a9a7212f..4a5ffcd3326 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 eea2a50c681..9a87ac60a6d 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 7af7d535a55..ff0b9d944b2 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 b7832c9fbbe..a4c319aefac 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 e7b8d1b2acd..a3bea53c909 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 a4735275d83..8e2b8ca9bbc 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 56f82192d4c..7cf338a9499 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 ae9e32d7c7f..91dcbf46784 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 687e01e5132..30298087b33 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 48467ade8c9..37fc45c2340 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 46993afc7e8..4c704ccacaf 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 7366420332f..fa4ff7f5cff 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 e0139571fe2..cfe0eb85628 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 9c495f2c86c..64c009bf919 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 cc8b722413e..b4a6bd5a1f9 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 27b63bdf2a8..9ee6b49d2a1 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 3940191f571..ab074c7849e 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 7532785a5da..2331c9edc8b 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 7f0dc1d91cf..419ecc5122a 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 2d74bfc8b38..418c35cd255 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 e291dd08554..6517cf88c13 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 74202fa9661..98d4e0c89b4 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 3be40bf61e1..406b9255553 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 3002b50c223..54710fc3c8f 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 abf3a76cc2f..4e1ef94c008 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 f204790e8e4..3b3b8a558ae 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 7dfd7eadbf9..485ff119efc 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 3abce0d0d59..db0c9a690cc 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 2a3b7390b10..7dd32c5a900 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 13395d10177..14b5176415b 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 193e2fdc74f..7b5f71b84e5 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 e552464214c..84ecdbff9e8 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 b638eb4822c..2510a2d2dee 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 e44849b061e..3b55e18c67a 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 c0b685c55b1..98e5852b67e 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 85a1c41f07f..6fe0d968f72 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 bdb1a7a8786..ef5dc9397da 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 059ab8dd8f0..2a347461834 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 9ea2485eebc..293824d5504 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 cae3426e755..c5e075a944d 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 cacaf5d36d3..969a115392e 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 3ac634134a2..6119213289a 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 12ae1ac7cd9..24beb0d31a2 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 9049a65ee1b..854910bc311 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 4c39fb5bda6..79892e8ae42 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 c7604184d2a..950c4784d82 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 7b6342ed1bd..25aeb513bab 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 579f78e7efe..bd8fc22ba3d 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 5fbcb746026..4f160c13707 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 314f78ecb81..5a72058097f 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 d2a04d905a3..21f87c501ac 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 13357217c8d..7fcb0ff66dc 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 ileri"; @@ -35,7 +35,7 @@ remove_data("file_cp1254"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\okbaytl ileri" 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 2e63d376c8b..7a3d496f9fd 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 7391c3bd9db..0cb73207e80 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 8ac17416fe4..ea4950974ca 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 8a685b68c45..01b4f7732d9 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 391a282a69e..991d2ab615d 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 2f38398bb57..276af84a91e 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 6d8b55d5369..e33616ddd3d 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 b73f01f729f..b241210faa5 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 07cfcf053f9..10fef624040 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 6b473abb549..617ebedddd2 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 1a4233f2c23..341c0c01a29 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 5c25d60fc8c..e8cf5709a73 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 3471fa7b1f9..32596c2bd50 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 4c12d76d97f..fd0204aacee 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 4f3108427f3..ef0229a2e94 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 52f080e2c22..efc43f35139 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 6cb2fb7eeec..aa877d7406e 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 8d32f88a8cd..2c244997b67 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 1835f0d360a..48e55981cad 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 f7f24c045df..b177e2d1e23 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 d529f6a484a..595f86213a0 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 db31c1ad7a4..95992ae79f5 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 = "eXg}`oCgEpX77"; // cp932 string @@ -35,7 +35,7 @@ remove_data("file_cp932"); ?> ===DONE=== ---EXPECTF-- +--EXPECTF-- string(%d) "%s\eXg}`oCgEpX77" 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 a04c14d2768..5e0e67b6626 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 9b13922a7a2..2092e40da00 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 fbe290468c0..bd9b1791ea2 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 bcaa31353f6..46db0ebc4b3 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 9edb6d13013..9eb1f082171 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 2c05c313e92..eedee97bd05 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 554a05d94c5..b0b709c0cc7 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 79bdfa4283b..2c4b2876c57 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 22b64c31f94..b260b7b37f4 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 0ff640aa35e..4b2bae974fa 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 5a481e8d12c..db3f1d861b6 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 50727a9d713..0d06fb24894 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 a2878473527..51f1bb945b1 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 8f15596d38d..ff32d75869e 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 6b0f864cc21..192072760c1 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 0dcbba24803..5cc697c0fca 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 0999f7c6b9d..fd2a4bd4ca0 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 d1be6721367..37820a99c49 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 b70bf9b8f04..378001623c5 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 9bd7ddfb35c..51a079ad53a 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 efd6b762556..c8c8ce66048 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 index 5c6fe365233..803cc8ce0cc 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ 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 index 4fe2f4c95b8..cc3540c406f 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt differ 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 49293626130..4f82039e2de 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 b14dcad3448..64352105db1 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 68a9f7cd9eb..f637bfc2e95 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 136f57707c6..1bb4d1151ce 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 129aa87b3cb..71f4e0d1397 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 aa808cfba1d..2aafa0684c1 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 ad40e2df7f1..ec982bd55be 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 098abd19c67..b093ed1e0ca 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 cd0360e3eee..b809dc9d552 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 d3d72f301bb..44bd822d12e 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 c412d1816c7..ac4568c6218 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 127378d3c11..8ce2323a394 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 10862f44684..1728dea23f9 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 99ffbafdeab..58a49e713f4 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 f7457bf7f4b..a010f7eba4f 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 df4a04b9d40..499581c05bc 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 0fe0a6afba4..a2b03ee07ae 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 04c9fb9abeb..66deb91a311 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 af8959d9fd5..325e91e47f6 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 5761f1b8321..7fb8789ff3a 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 ab9126c281d..99ab02a60da 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 ff30b3e919d..71b03461eb8 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 03fd9e3d9e9..a14cb73dbb6 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 9af1bfbaa8f..c5e2640f9c2 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 5217121385e..27beaa07444 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 8431cb802f3..dae20a18568 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 e64dd08b802..97f550e446b 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 dc121538320..e76d7083d4d 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 150c7f8222c..6a295308afc 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 767e5d93202..223b732904c 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 82bed146a20..a6c6111fa1d 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 bec24c8e815..76578753117 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 5bfd4be3216..af562d4ef1d 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 e2230476401..b71a5283dbc 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 7b20dff2ce7..9410a21fe25 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 4266a3b39ce..d154b30748f 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 883debbfd83..68ef75b35b0 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 dace39ca107..fa7c87f7917 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 b88f1ec24a9..0019cf18d2f 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 0060f5e526d..8abc766376e 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 5ff4d2d59d7..75f4e4a8d8b 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 acb3cb660ba..f7168737cd0 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 a7adf6d8e50..53620178c4a 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 685ac6fb14c..72a885a57a2 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 77310977997..fd3f5be6a0d 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 bf121ed6dcf..5f0432b5946 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 9c76af97bd5..1c623409706 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 3d3b47d615c..0664043eba6 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 5fdc71d67c3..b3470bec559 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 c3939a2246e..1621fe9f167 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 0cc8e609b1a..fe02a97c181 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 8809a1b808c..25776dd3baa 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 539eea202ec..87a4545501a 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 dc104283eb1..f3335bc8ce6 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 bc8f29b6fe5..21734773a32 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 6e90471bdc1..d64987018bd 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 08ac2f1d018..69c455d076c 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= ?> ===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 2c5f5ab3e6e..0ef0e7c2131 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 2e758377010..c4f069a3d2a 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 d72ac7a2abb..b814733dd07 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 109fe003287..285365ab608 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 b358edc48cf..388bc42599e 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 a4b31c65240..17822376ad1 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 93aa9824e32..474aab7d5dd 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 bccbd23910f..b12f5f579f0 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 f9ed8dab2e8..a7f61ec0636 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 10fb8898582..e8939f1d0a2 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 9dbc821271b..bee1843989e 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 300b5287c8b..6dfb08f082b 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 f31334e69eb..b66d2c45840 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 9b6e42c71eb..cfdac8b2681 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 3e0e50f21c5..ab81fa802e6 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 a24b44b9491..6eff478d707 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 02668237c94..817ffc91f02 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 3fe0a23d3ae..a52bf430d21 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 de66874c25a..ffa542c0536 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 9ad5803fbee..57764e54d14 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 284460d2420..a5acb37027f 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 f911ef33d26..e4403a71203 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 9544a2acf19..d72535c91c5 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 d171365bafe..000cef05552 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 a5f5bb8cc3c..99c6e7c63b2 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 23f2b157454..09679f53c76 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 8288e28bf94..c6bcf32e257 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 9db2b5eadb5..26d871150b1 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 8c37da76651..f8ba898d7d3 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 1de9850651e..e46b9e97b47 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 f5f2b83da20..ea7b813d776 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 2410cff4d50..e09eab40af5 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 360394ae3c7..635750c51ca 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 74f27a877b0..40b5a077259 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 88aacbf1763..9a3e2d17c5b 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 2c67338e412..d6276cf5598 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 11306bc19d4..6043c811803 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 1b4f418cdbd..d8366c15e39 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 0a963387360..8ec2e37ae10 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 e6cef90fae4..f0a5d5ea852 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 78fa49fe424..98ece497698 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 46abdba7c80..44a06651ad1 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 b0c95f35d1c..ddc5571c7ec 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 24bf2f92f19..aa1e0b1ecd1 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 70142cee1fe..3bab8056494 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 9b11ad00c5a..c7f8ff9824e 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 591d48ac532..c6cc005dd55 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 815eca28c62..eb4c47271f1 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 13e75a6c2a7..dedb1e3ff82 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 d768fc9be56..5d1ec6b7a3c 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 ec51737ceed..c90e909c6f2 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 e71fafbd13a..efecd162e9d 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 d520cdc2543..fd40f97b681 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 49ede34eee9..7e78bcfade3 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 58ebda047d7..258bf31377e 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 5462c85c249..4c8ee2ff6cd 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 8a569c0c320..ae6e308715a 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 881feb96d90..153aa80fe86 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 532ba94c961..5575ec57960 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 c011f4aa1b7..cc89ce3e768 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 bd2321e9c86..c8063849fd4 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 d8fd1828c9f..5e41a459005 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 f0055e4fdb7..f6dae629006 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 ab8cf72a8d5..7f9be489e77 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 9d61a099725..120ac45eb55 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 81174e0322b..b6a9a9ec32f 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 0dbbba851fd..2b0a4b10854 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 1643bf153ff..9591411db3f 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 24a91bc0c04..cf7c50a09e6 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 79ae0a56d64..0a8bb0587dc 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 5a556b7d2bc..488ab538ede 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 2aa43865875..23c3b6ddd36 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 b71178ca192..9e06267d227 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 0220d933550..f44c6de4ff3 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 ec6fb486424..6323042dc7d 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 f4f7e89fc15..cd64670668c 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 4cab650ecc7..158c05b54af 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 007c998e48d..38279c41ce8 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 53ebbe184e9..b6341cca76a 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 92312e40539..b2209ba3016 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 851cff44c4b..9f6328c24a7 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 0575c7fcd53..ee51c134d5b 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 b97285ba94c..404e9dfd825 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 35d2bc50917..19bda37bffe 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 a991bef48e9..85230df2b3c 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 bc17cbe6846..14a978b2b3f 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 58131c67d3e..d5f6920ea7a 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 870fa285ea2..973f74de0bd 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 07e051b179e..5305b636602 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 8d0bb7ca02d..5690f4cf6f8 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 380633b67bd..f743e48d185 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 8cba8b1eafe..de51bc7e755 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 5076292472a..986ee269246 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 afba080cf33..c851a2632c5 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 b10a6b9844f..345d74c4315 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 fd8f1c62fa3..6c5fc825416 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 b99b2b08322..a8f2e9fcca7 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 c4884742f22..aec6b76a7b7 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 b8bf5488015..225e42018bb 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 c45c2aa92b1..7b65e5623a5 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 1712a5750fa..34b2e474d08 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 c279addf06a..f70a48eeb2c 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 c47aabcd8a1..107d3e40de3 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 f8491167cca..762bc587275 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 9685ff234da..989e7d00aea 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 679b7023190..d0f5080619b 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 bf4f3e41e18..498d0b2717f 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 2a02dfb9bb7..6df5c66da6e 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 d04a91b5525..0f57209b985 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 8a37912f80b..3ff65483fed 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 fed29a89015..9cd24cfd911 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 40099689ef9..53043259528 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 4270ad69209..61a0c3d8399 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 62549c47651..09d63be1289 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 138471418a8..b166c302ebe 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 a928af60132..2d0a0b4bbc4 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 9d350f212cb..5874f63211c 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 33cb38ee7b2..4ea191e75c3 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 6dedc78be1f..3a1e4406ebb 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 545cdb0b43b..d4f976b98a5 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 b258dca2ad0..5a5b191b1c3 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 bb96764a16b..2856446e19e 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 db1e40e831d..5a2570126a0 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 90ef3ea634d..b12c81c1a29 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 dfa9e9024c9..7c72205639d 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 a652f30623f..ba613aedc58 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 3ba10a55625..5d94acc435a 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 57edb35425b..42d6a730684 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 b4d6c8ebe90..10814ae8e81 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 c9e13770a19..abd4f26d8e2 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 1493ea5bc5a..512efd034c8 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 2b98844fea7..a3e13d861c7 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 8e2497e85c8..0d8b1960be3 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 7c4d7a04604..4876447da9c 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 d9c81143aa2..596a1940a41 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 a9fb7b399ab..f59a7823b4d 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 a84292e5985..d77d48e6a43 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 7c11e39bc9f..1aee6af2c79 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 1d9d6bf8d53..d6b927f2d53 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 48070e967f1..454a9129f4b 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 3ace9f3966b..1bb5ec06ccb 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 9f79ca1c3cc..5b635dfbdcc 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 a212a099757..e47e94d629f 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 a35730552d3..7369b98dfda 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 8b73eafc20a..8e5a1cc5e89 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 6f54f95234d..81546bbf6fa 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 e15b70cc0f7..b1b477c150b 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 eb480680eef..312bd89b66b 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 c9c367bb1a5..049c8b9431c 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 7bde7098880..551206a5693 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 2be972a1342..cac7133e955 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 0430582181c..77c7155ea88 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 5dac063cf68..b72048bd76f 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 5131651db8e..4795008b5ba 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 dbbbb6765c5..638412b47f4 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 a20b4756c15..0e659378717 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 68a0cc7147a..f7982d5ca47 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 2cb3d8d2293..2c6a6d3b219 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 9d1580c8261..ceb2a843fdd 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 0ce348187ee..9d4c29619b1 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 7c4722d3c79..4816d63943e 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 58494a1f176..fa7410930f3 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 e6414ee902d..d85b6ba3c93 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 f217d71f882..7003c368060 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 fbed4cf146c..93efc098b5f 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 973fa958442..47da28f0949 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 d42be515561..c958af432b7 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 fb813bc0d90..6ba93f4d23b 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 berKli + class berKli { public $ber = ''; } - + $foo = new berkli(); - + 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 15bad692ed0..4e61e653546 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 68727ad1040..b8644c44e96 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 3de28f33263..1e8cf1acf21 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 f03041f6a99..fd78fdb5363 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 55e34f37622..ee89e9a1e21 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 02726d20ea6..a6209688eae 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 f941a5caecf..9d3bbcabeae 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 4d615fddc6b..97c2af4ccbe 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 index 0d800d15162..3617458125f 100644 Binary files a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt and b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt differ diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt index f85b89e1027..d887aba236c 100644 Binary files a/ext/standard/tests/serialize/serialization_objects_001.phpt and b/ext/standard/tests/serialize/serialization_objects_001.phpt differ diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt index fbd9e261206..c7f9e1cbd30 100644 Binary files a/ext/standard/tests/serialize/serialization_objects_002.phpt and b/ext/standard/tests/serialize/serialization_objects_002.phpt differ diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt index 30bb34fafb0..d72c471fae3 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 bc58ce29e9f..ed283411435 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 9619a2949e1..4c631c6a596 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 345ce0a77e7..93fb726b4c8 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 4de50afd6b3..ff584a09198 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 6d1c0e038d4..484d38216d5 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 8ec05887848..0c969df7cdd 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 e03440fb7a8..60b9f23f314 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 bd1e75449f6..09b3046d051 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 90d9e8f99dc..b834de3221f 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 eaaf05e7c51..1d4ec1c1ecb 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 d4cfc770dbd..c1681df37da 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 9e9e6ae07d9..c1a6675db4c 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 11b86cdf704..b4a83effd89 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 d17865f3291..59f09120c7a 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 089ad13fa79..233b31ba64f 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 84e818f9aa7..7fead5362f4 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 bd04a5e6b26..67c66d61bc9 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 fd02b8c0bcb..c96a8427931 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 b38ccbdda82..ebb358707ed 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 f44c26d8a6a..a49a2026b7f 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 f0d67a35243..4787b971718 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 28fa43cf268..d2d2ce8b9ce 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 83d40e8bb1f..a9959799925 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 1d6a9057fa8..2b3aedbf30a 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 b50c6580c2d..06a3f944bed 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 401c65bce05..1e5b7e31d80 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 bf35925e4df..3f4fc486678 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 a133ef1e087..bb98d7c6e79 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 d54eb04410d..f7ccc7783bd 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 63c9a8df426..0334b951e02 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 index c9722c7fe7e..4080c7214d7 100644 Binary files a/ext/standard/tests/strings/addcslashes_001.phpt and b/ext/standard/tests/strings/addcslashes_001.phpt differ diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt index 7c97adfa2d0..f743726301f 100644 Binary files a/ext/standard/tests/strings/addcslashes_003.phpt and b/ext/standard/tests/strings/addcslashes_003.phpt differ diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index eeb56270673..8b2c7fb2e41 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 e920dfd1c49..c5d67c09aeb 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 1120cdf494b..e204498ba67 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 260b1f0653c..628980df278 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 index 31299276b37..0a598b8bfa1 100644 Binary files a/ext/standard/tests/strings/basename_basic.phpt and b/ext/standard/tests/strings/basename_basic.phpt differ diff --git a/ext/standard/tests/strings/basename_error.phpt b/ext/standard/tests/strings/basename_error.phpt index bd7741d0e95..8309c3578be 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 8928fa1aeba..9211f1f7c25 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 587f2b114c4..3cb74c21edd 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 e958a2c8f4d..1da6c181137 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 7a0f3dde0d4..9eb07b573ef 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 9d2e1313a1e..efee90bdee7 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 6317c974ab0..3c52250718e 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 index f1973eeaf4d..9297050a997 100644 Binary files a/ext/standard/tests/strings/bug39621.phpt and b/ext/standard/tests/strings/bug39621.phpt differ diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index e6011dd5f79..ff7dbf4b8c6 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 index 7b68ca28d0a..7e25ec12e3e 100644 Binary files a/ext/standard/tests/strings/chop_basic.phpt and b/ext/standard/tests/strings/chop_basic.phpt differ diff --git a/ext/standard/tests/strings/chop_error.phpt b/ext/standard/tests/strings/chop_error.phpt index 71a1004ecd5..2f2656f3aa6 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 a5bf0afc483..51f53f0153e 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 bce4184d427..e072febcffc 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 index b5015a01082..be0b1a32da5 100644 Binary files a/ext/standard/tests/strings/chr_ord.phpt and b/ext/standard/tests/strings/chr_ord.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index a1a269080e1..cce8e4d64c9 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 341f04ffd35..d8a72586af0 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 5f41c86dc3a..0b24f9b6d92 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 c08a0c3d885..67b0f3e76ba 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 2162b965220..bafd9f44aee 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 640df405f7b..e7fc0744ee8 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 index 332aecdb967..8a5a8cd6bb0 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 84a3a5ab676..c3456a70c42 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 index 0cd3bec922f..fa9cc43086d 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation7.phpt and b/ext/standard/tests/strings/chunk_split_variation7.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index c7989b05390..36bb26b4bca 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation9.phpt and b/ext/standard/tests/strings/chunk_split_variation9.phpt differ diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e38fb3f6394..8a368e17efc 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 844f2d74d8d..66effea4302 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 3552f6d6747..963c1637610 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 77d3a88833d..77ac18b50bf 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 2d4851945e2..b8c338a1c69 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 a995e18fe29..ec4d3f64777 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 f74496214a9..c39889be156 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 2ddc2f96185..9c7794b96fe 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 71798ed002d..98680cde34a 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 28f01e0f7c3..1d6f33ec2e9 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 51ccca8bebb..76e57c57f74 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 505446a1bd5..691703103e2 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 00b47dc1908..f3f11972fbc 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 303a59b2d57..98a9ea5b456 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 f4a90573f33..68429476057 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 7ff0aa9a41f..8ec12b23646 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 52ba2f44f32..1715b0852bf 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 149adbc197b..5adfe984780 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 b7fd6f57759..0794853e8e1 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 907eda35aea..8d9fe0af563 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 5cdd86ca360..cc32d654e83 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 8abf68cd70b..a04e519db53 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 2eaa6d712cb..d8b4a5484bf 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 f75abb3a4d8..630c995b18f 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 d1a0323c58e..65636908e61 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 f2e107a7355..5f54ee6753a 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 3ef932a70b5..44396b0e2bb 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 4e83b5de5cf..c43d385563f 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 f4201d2842d..36b8e6bbec8 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 2bbe274d714..4b4af9c63f4 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 0046236259a..4a8f165e9c6 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 85e34b8c8d9..8aa9479e5cc 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 index eb94c9f5ca9..596a883be24 100644 Binary files a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt and b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt differ diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 4a70404ce03..7b73982c0cc 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 9edcf43e810..2b8ca148ff6 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 d6d50d1e85f..c9b03141bfd 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 index 3720c069276..d5de391e967 100644 Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 1bf9a89c9a7..483976d9423 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 3c724229073..36ee9d7ba6c 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 93f9822e2a0..c3799cc01a5 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 a02efd7767a..361f65bbc55 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 index 412f36cda03..08938bfad74 100644 Binary files a/ext/standard/tests/strings/join_variation6.phpt and b/ext/standard/tests/strings/join_variation6.phpt differ diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt index 9451ea80a3c..d09e51eef52 100644 Binary files a/ext/standard/tests/strings/lcfirst.phpt and b/ext/standard/tests/strings/lcfirst.phpt differ diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt index 0d0eae88f73..45967fa24b2 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 eb4f9381527..4d6e413672c 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 86377e227d6..e9898cd0c09 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 index 777140957c7..8e917767813 100644 Binary files a/ext/standard/tests/strings/md5_file.phpt and b/ext/standard/tests/strings/md5_file.phpt differ diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt index 8b87c375ac5..61fd816dae4 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 dbf4227378d..b40e7b16a55 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 21268d03299..1d1d6592b4e 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 beebe03fe21..06a70cbc410 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 b6f9fecc91f..82fd6c0f955 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 0bfe2956cb3..c8f3a284bf1 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 631bba0558d..79ec7b85ac3 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 c445be1e492..f49948206aa 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 d72fb2624cd..b3f2fe5cfc7 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 88a13ca387a..32a8fcd3fc7 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 index a38395b8841..0368dea5f9f 100644 Binary files a/ext/standard/tests/strings/parse_str_basic3.phpt and b/ext/standard/tests/strings/parse_str_basic3.phpt differ diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt index a2402b78136..dcc3888e7ec 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 27862c74e86..0b756419910 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 18ed4232781..101d567749a 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 d989d6a42a6..eab44a4a657 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 d0b7aaff446..1a909703713 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 2e13f7ca16a..bce0c4d0d7d 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 17200569122..654c418dc4f 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 d823a89eaf8..9008f5c861f 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 413ae21fd29..37081b3cf11 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 53661a8e70b..dbbd6c61548 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 3cdfb9116d8..108f96a1f05 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 6ecc72c1163..08c4cf44242 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 46809417847..75ae1545d99 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 997dad98e7c..46beeda10e1 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 30f7d6cca0b..14bb7d7ed55 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 04665b54553..6dc4179baf0 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 e138734920f..fad3298cc7a 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 c68998fcfa1..dcdab87bdc5 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 d2bb0f13a63..68728206b77 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 f17c7e42b85..0ba6d890248 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 e666351d207..193c64e941a 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 cb65572fcde..83a191b172b 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 e4735859899..35fb16a87ba 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 e7d8f012180..13c255451a3 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 c4c2bd83f2a..4f21adf7124 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 568b842338a..099dd233a1e 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 8224d0eee65..ca26ef29c9c 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 367ee60f150..401eb674609 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 20cf2c9d3e4..8ff93b6d706 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 18317373f48..b9327687e95 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 16c035f34b3..8d682ad9f95 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 e6cd477bfa4..343437615af 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 5dd5dd26b65..21a9ea280b1 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 8ccb899b2fd..85660544bc3 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 882aacc107c..913817015be 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 9554ca1f59a..0b3140dd0df 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 b00c05bc8f3..c3cd33656ef 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 538122101d2..f705e7bd1db 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 2facb3f896d..ec4063eef7d 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 9271bf92c94..53c8777cfdb 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 bed1108118a..1c12cd31686 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 ef66b68117e..f7bb9dec00e 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 9bd1379589f..c298b083bc8 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 5a7d22d1bf0..cb2a3a9cacc 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 ab3c3d34e17..b0fc221a0b4 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 8d39fb9e62b..de40856c365 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 7b346494268..7ee6f4a66ef 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 index 1ec44a6d031..308bb7ebccf 100644 Binary files a/ext/standard/tests/strings/sprintf_variation15.phpt and b/ext/standard/tests/strings/sprintf_variation15.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index 48b3cda4641..40c0e87d149 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 649a1f5cd13..dc9bc8bcada 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 8f702e08b92..009b45ef31c 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 5c7c8b620f4..ede367bbff4 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 858ae7402c5..967949a09ca 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 5f44d6a42f2..016e6c5bf18 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 index 083f3827fee..30c0527277d 100644 Binary files a/ext/standard/tests/strings/sprintf_variation21.phpt and b/ext/standard/tests/strings/sprintf_variation21.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt index ef92e521e83..0280a6a0e88 100644 Binary files a/ext/standard/tests/strings/sprintf_variation22.phpt and b/ext/standard/tests/strings/sprintf_variation22.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt index e0d247346f9..fc3148c0be1 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 index 3d874b5cbd9..b4e8f51e912 100644 Binary files a/ext/standard/tests/strings/sprintf_variation24.phpt and b/ext/standard/tests/strings/sprintf_variation24.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt index 1525a41cd54..1e81c7137a3 100644 Binary files a/ext/standard/tests/strings/sprintf_variation25.phpt and b/ext/standard/tests/strings/sprintf_variation25.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt index 580796add05..0b1170142bd 100644 Binary files a/ext/standard/tests/strings/sprintf_variation26.phpt and b/ext/standard/tests/strings/sprintf_variation26.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt index 01bb956384e..b660334741f 100644 Binary files a/ext/standard/tests/strings/sprintf_variation27.phpt and b/ext/standard/tests/strings/sprintf_variation27.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 3586c262df3..747629f3f76 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 6e0d8eae934..0fac9573bee 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 2e686771ec9..abb82415ccc 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 f758a673e4e..8dc7a45d16e 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 905507e7a24..c6fd878c1b3 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 4f91ad57f4c..d0beeb95016 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 31f211c7957..af285dab232 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 e6ca521f727..03caa63493a 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 9b3e602a2ff..b629dbabfe6 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 0dd38448ecc..81e79d0c02d 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 d5d8fe229de..27ef87796a7 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 56afca215d6..2056f083cb4 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 4a2c701acd2..386a2b6b582 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 1cebffe1298..bf05a99db43 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 51fcaaa0d72..d474ee0e1ae 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 6b29c1fc096..5a34280b95e 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 c799d169c26..f9d9dbe222e 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 9ab493ff378..5345fd1088f 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 da626a4d816..c6335ebb6a1 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 f887ff5afac..ae5928931a9 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 a87c1dd33ab..e888fac941b 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 02991cf3ea5..c976a7b7995 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 7f994e23d79..760c173a005 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 4def644ace5..ea34bc8813b 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 f4023546eed..10c65a8d299 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 8aef09bdc91..24c80ded3b5 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 a2a2f570f31..5cdf9da9989 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 79e2dff6f1a..3ba8164f4ae 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 a9358852426..72212b62443 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 b3eccf7e132..ac551a4453a 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 bbd3ce7e34e..31177ef5219 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 990c0b28d40..79aff1fc39e 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 5fc863781a6..4fc37435ef8 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 bb4c96bb645..d4f55d47e17 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 ab245da1a12..0ee0c52c656 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 996434fef4e..7817f77b2fb 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 87c91389e62..2993dd00f1f 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 361570ea91b..1bf35df284f 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 49bb8932a7e..a37280df136 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 168f424a21d..73efcc05836 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 6629a34f806..f2564abd534 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 8d883a1f926..f2a3dcbfec4 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 index 0c0c2026cda..b44a9517ab7 100644 Binary files a/ext/standard/tests/strings/str_pad.phpt and b/ext/standard/tests/strings/str_pad.phpt differ diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index e694fa9db70..32506ab1a9f 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 ec0aa959af9..114d5f5ba13 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 1e924efe8a6..1e58477f21f 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 b72ec20c02b..22ca2d52702 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 f1f47b932c9..8eade37df3d 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 index beb5e805f83..306b7d381af 100644 Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index b53ed665d47..7b411abac54 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 a133fd8bd58..790a32fffd2 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 38c62dc86c7..b66fd8c9ec2 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 0dddd2f5d83..067e26307d4 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 index 5534341dcfe..5cf7f7c0146 100644 Binary files a/ext/standard/tests/strings/str_replace_variation2.phpt and b/ext/standard/tests/strings/str_replace_variation2.phpt differ diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 1042bc30996..8ae709745f0 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 063ea0199e3..348f1bb731d 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 d8024290e01..8b83b5e2d03 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 72617cea9e7..b9cc8068bcd 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 c7075ec0ce5..1a4558e6802 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 46406f56a06..94eca406fd9 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 ef2ea94a9ed..0bb8304b56d 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 d465e355d66..92a07498a4a 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 index cbdad94854a..6c2a3c83f8c 100644 Binary files a/ext/standard/tests/strings/str_split_variation3.phpt and b/ext/standard/tests/strings/str_split_variation3.phpt differ diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index 444384468a7..caeba8a6f27 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 b5a175757c6..2f3f5a2f460 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 95afb24e59e..a477800a262 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 39c3a85f0d6..583c7db3cf6 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 0d343172452..5082c7ba2f4 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 1f324b24216..bff61adb302 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 index 265b8708ea2..9b1898fb35d 100644 Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index dea94644aa2..ef659014a51 100644 Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index 01ec5ea321d..d31756050cc 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 4b690638811..ebb7f9f0d09 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 index 9b40bad2d77..e6fcae92200 100644 Binary files a/ext/standard/tests/strings/strcspn_variation5.phpt and b/ext/standard/tests/strings/strcspn_variation5.phpt differ diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt index d235dc4d198..632aaa4b5de 100644 Binary files a/ext/standard/tests/strings/strcspn_variation9.phpt and b/ext/standard/tests/strings/strcspn_variation9.phpt differ diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index 05380ddff54..164cf504522 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 c45cbb115a1..25f703c3c03 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 c02027d5dfb..5c7fd642ade 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 3c6200ee488..63d579f4ada 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 c0a6e92423c..a32e3eccad6 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 5b7c50422e0..2117c1306ce 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 af289f7793a..24a23810d57 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 78103ec31db..174da564433 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 d08082e3020..fe3a7866780 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 c59473046dd..324014cf6da 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 409c041dbd9..81b8f5adb1b 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 1e09b044cad..cc419787d69 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 694827051f9..a6414897554 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 fc678a72678..936f8705798 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 5c4028ec45d..98e2d25c44a 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 8cfc3f91943..095937fabf9 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 151b1452296..fc441e10884 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 29a0a20469a..04c636365fc 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 a0ae75dd1fe..41ff384c38b 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 index c7027e932ff..3286765b3a5 100644 Binary files a/ext/standard/tests/strings/stripslashes_basic.phpt and b/ext/standard/tests/strings/stripslashes_basic.phpt differ diff --git a/ext/standard/tests/strings/stripslashes_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt index 99d877fd696..81b9889fc4e 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 6f2e928cd59..2f9239ceee0 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 index c3c58f9c429..e8edf4cd4bd 100644 Binary files a/ext/standard/tests/strings/stripslashes_variation2.phpt and b/ext/standard/tests/strings/stripslashes_variation2.phpt differ diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 274438a86ee..73cbbbe17d5 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 2da35de7358..a0057574f91 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 index 52e0200af16..8e6f857b74a 100644 Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index 9e2605a6704..721e4f1d26e 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 552e7c1ca6f..d893936de3e 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 da71edf79c0..5b58e2331ef 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 3085e8d8fd6..2105904aac8 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 a2f7ad38ca4..ac2cbb69f91 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 34a1b08dc4a..c0214833594 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 7b2d19e616f..d443f8113b9 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 8eb03ee5181..1c5708ae695 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 d382df0a8e4..362bbf11676 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 bc680caa313..93968db2da7 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 317039859f6..a836e591a54 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 8e4d2805eb6..4eb73eb3182 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 9958abcaec6..5e96e5d16ff 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 7cc36bec7e8..9a92b8b4b58 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 009aac699ad..658e2f429e0 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 index c9c34535886..578539804dc 100644 Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index 5a2f86619c7..822a755322e 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 aa0adf4b85d..de5a9d34de7 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 index 7a8b3c97565..6b462738360 100644 Binary files a/ext/standard/tests/strings/strrchr_variation1.phpt and b/ext/standard/tests/strings/strrchr_variation1.phpt differ diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 35ca3c63309..7b106a1c2aa 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 be4a95468df..a9695fad6f8 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 8c385e5cb85..1bef8a95122 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 6d768e06bbe..0d67fda06da 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 d60b2e67113..bd58189c200 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 1a86ba0cb14..760bfa60673 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 390b78648b5..64687272c05 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 ef64e80afda..2bc8a228ef9 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 index ce0588d750e..b13579f20ba 100644 Binary files a/ext/standard/tests/strings/strrev_variation1.phpt and b/ext/standard/tests/strings/strrev_variation1.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt index 87c64ec7947..d8ddda476c7 100644 Binary files a/ext/standard/tests/strings/strrev_variation2.phpt and b/ext/standard/tests/strings/strrev_variation2.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt index af1d276ea6a..6648c1b7fc5 100644 Binary files a/ext/standard/tests/strings/strrev_variation3.phpt and b/ext/standard/tests/strings/strrev_variation3.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation4.phpt b/ext/standard/tests/strings/strrev_variation4.phpt index fa347cd2fd0..b585035c11d 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 59d592681a2..97445f0c86f 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 0495f6c5f27..5a8f7332bb1 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 4222b068556..866a75dfc2b 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 c3801063418..4fccaeb47ee 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 ef872d7c762..3583f3646cb 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 7530a9f4468..677e108e333 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 3900ceaa5d7..d97af99920c 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 ceb49df819a..4d23db75da7 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 c2e78f15cd8..32980450b28 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 b46f2e98ef4..8f9946faf33 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 2772a2315ae..bb8258ea0cf 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 7027c069c7e..2ab0aa76b9e 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 a9202259475..6599c7167c3 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 40ac17affea..1e07fd9b5b6 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 0d985d86b4a..46a727516f5 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 ba5c5a1a406..cc961f75b0b 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 a6318add969..8481191e7a9 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 d69e49f1d4f..fe4706ca24b 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 2da0f528e34..44eddff3cbb 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 494bcd6a058..0cf88c25d27 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 41dd46e4f6a..bc21ce65234 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 c8dd29f2140..8086c53f664 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 index 04ac841ef76..eccf5dff34b 100644 Binary files a/ext/standard/tests/strings/strspn_variation5.phpt and b/ext/standard/tests/strings/strspn_variation5.phpt differ diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt index 5ec2330e25e..0835047ff59 100644 Binary files a/ext/standard/tests/strings/strspn_variation9.phpt and b/ext/standard/tests/strings/strspn_variation9.phpt differ diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index f746b03079e..3cff71936ef 100644 Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 3cb687295e4..f0774c86443 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 b05a86c5fd0..b54fbbe19b0 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 7f7713c422c..9c46428a652 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 16b64c876c3..cd7f3b3041d 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 index ffaa1487bad..c0ad1d0115e 100644 Binary files a/ext/standard/tests/strings/strtolower-win32.phpt and b/ext/standard/tests/strings/strtolower-win32.phpt differ diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt index 166b5ccc677..47dfe097626 100644 Binary files a/ext/standard/tests/strings/strtolower.phpt and b/ext/standard/tests/strings/strtolower.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt index e0adc645e04..60701652e19 100644 Binary files a/ext/standard/tests/strings/strtoupper1-win32.phpt and b/ext/standard/tests/strings/strtoupper1-win32.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt index b83a8a3a5d4..e0ebf42ea76 100644 Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ diff --git a/ext/standard/tests/strings/strtr_error.phpt b/ext/standard/tests/strings/strtr_error.phpt index f34085fb4de..0d4d1577763 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 bac7903fa05..cb6ad267ad5 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 831d81d3fb2..5e06da6178e 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 5842795273d..9f7cb953718 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 646e4b4b223..8d29db1cc3a 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 94d1d92331e..8140c1cdb12 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 629c003679b..94ed70263a1 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 e17d9941d5d..2eb665631e2 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 beeb8c9283f..947d47f20f2 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 index f0fc06424b5..0901d2082e8 100644 Binary files a/ext/standard/tests/strings/substr.phpt and b/ext/standard/tests/strings/substr.phpt differ diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index 9ea1d95121e..eecc251e6cd 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 31fdae33971..ac945349fe2 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 87f261ca7b6..08f75846a59 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 51dc848c9d0..e34cd144cd0 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 index 572d26ebd1b..66da7a90f37 100644 Binary files a/ext/standard/tests/strings/ucfirst.phpt and b/ext/standard/tests/strings/ucfirst.phpt differ diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index b0e3be80a7f..e35a2c5cb40 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 a01c688c4a5..7ada10c6293 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 c0107e13007..16044023534 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 484366293b4..f04e4937729 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 201459edaba..49e9c19562a 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 5b03723be0b..63ccf7d7d12 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 1aabeedd819..e247c38fbbb 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 80edc9ac68e..a06b8d869e1 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 37d91a7b601..2843e33af50 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 520c8eac3ba..c3c869bb4dd 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 746652fc5ff..1eb89694ec9 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 5afbdf706fc..dbc0d08897c 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 8975d01a0fc..589d82c3d60 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 184aa0e3f41..6358bccd1c5 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 index bb00e70389e..fac24dc7a91 100644 Binary files a/ext/standard/tests/strings/vfprintf_variation10.phpt and b/ext/standard/tests/strings/vfprintf_variation10.phpt differ diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt index 0afe7c8ac24..bcb60e0ad0c 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 fe786d3f495..ffd232355cf 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 03253b19175..300cd6b6661 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 fb34befd3cc..9916967b3f0 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 fa81daee712..254bd8c2c1c 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 15b55a97dce..0819cc0e5f9 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 df43b2eeed1..3d0d8104427 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 76ba79fca20..55bfd465bb8 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 cbc74bfc692..1bf0861c0f7 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 465c21980b8..9194d848666 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 084947de454..036c52b04ad 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 index 120e9472590..677840a584d 100644 Binary files a/ext/standard/tests/strings/vfprintf_variation9.phpt and b/ext/standard/tests/strings/vfprintf_variation9.phpt differ diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt index f694155b8fc..e550ea1c8d0 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 cdf6c2d83f5..854d6eaeee6 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 966ea56f716..616399eed7a 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 89494e12176..d8cfa80452b 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 e999417bf82..67922eaa5e8 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 7f1bbd1ddec..9ddead58c41 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 64047882ecc..6fa89a1ea28 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 4aa12a080f5..8521d82ec4a 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 0bd1e248efa..cf25257fc54 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 d6bedcf1aa9..5cf50105ab0 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 index d63738e723c..747b8c40c56 100644 Binary files a/ext/standard/tests/strings/vprintf_variation10.phpt and b/ext/standard/tests/strings/vprintf_variation10.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt index d058e916875..99f5c803868 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 76819386fdf..22e1d83840c 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 13b43624a1c..b29af411c5b 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 0101f49e50c..27b420a7b09 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 480faa12c9e..6f9ab49b98d 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 1fca8300234..af5a76eded6 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 a8ee21f4f87..2e7b14db0d9 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 c3308be017f..74b57f4ae89 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 32618c00e15..d27bb6270ad 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 07dc6909bf6..6e27b55dd35 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 8c4fe3b2608..78e03644cca 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 7b72080e0ad..5189d58abc1 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 657225af9ef..e86f80551c6 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 961287f2a37..91f5d136941 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 8b826d8e94c..6ceda770222 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 ae9552021ef..9d059569f2b 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 97ddc67cb78..69e17d21a75 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 8ec00844ebe..6967679715f 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 d9566e2bf6d..aab27337d97 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 27ab3f7ed1e..76c079d69ae 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 654f9892674..dde6170e9f6 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 4614b9d1e1d..0283bc4541d 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 index ef2bfecdfbb..d7c81fca14b 100644 Binary files a/ext/standard/tests/strings/vprintf_variation7.phpt and b/ext/standard/tests/strings/vprintf_variation7.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index bd472aca7d3..f635b1d4c06 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 index 14609374a83..128af1a6929 100644 Binary files a/ext/standard/tests/strings/vprintf_variation9.phpt and b/ext/standard/tests/strings/vprintf_variation9.phpt differ diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt index 960fcadc3ad..611e4b8fbd7 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 bd1c3dd519b..1afaeb96151 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 fd0289ede81..44da08c5364 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 15f4a1a680f..569ba939875 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 3cb5ab15a17..78abb4523d2 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 74dec1ce74c..fe8e31d1684 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 3cc02c2e624..e7728af3ca9 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 571d9ac2de1..6dc5a4f4b7b 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 774779f2e5d..2876eb1334d 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 7e810d344d5..15c749d3f80 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 index 96783980583..d81d6c6a875 100644 Binary files a/ext/standard/tests/strings/vsprintf_variation10.phpt and b/ext/standard/tests/strings/vsprintf_variation10.phpt differ diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 5845c8b0ca1..286c3d0b014 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 879c05b98bf..50e3e86ab78 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 ae625bd895d..e7fbbd03766 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 17698497e21..b843bfaa895 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 e6509d08b0e..6cb751f2a0c 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 0ec7a2ad775..fe43c7faec3 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 37898cfff91..c8994739b62 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 5f31e385ec6..5e1eca1055c 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 ee5b6204913..62688be727f 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 82660ea4193..d4efd44fbda 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 e0933a3aa3e..7e86f2890e5 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 542202d95f1..00fdfdbf68a 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 5346bd4a06c..17790432aab 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 d2232d8fdc8..0d6c17a5619 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 de56405eedc..e2b3fe07785 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 9385a6e67f7..5cef628edbf 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 acf4bea9e36..9061c092fe4 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 195e4f1d607..86924cd4387 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 9291b04f372..8fe8aba5cde 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 4698a1dbc47..aa18d6647c0 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 0be56f1f96e..723cd2236c9 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 b10e3b11ba8..0f167fe8d17 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 index 0085138b782..8f5b8862c29 100644 Binary files a/ext/standard/tests/strings/vsprintf_variation7.phpt and b/ext/standard/tests/strings/vsprintf_variation7.phpt differ diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 0b6e3800bdb..109d8b626e0 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 index dcc1102ea0e..f1ed0932186 100644 Binary files a/ext/standard/tests/strings/vsprintf_variation9.phpt and b/ext/standard/tests/strings/vsprintf_variation9.phpt differ diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt index 1760a9cc779..37f15a3db21 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 98f199abc68..41c5cbdb69e 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 28fc128bb79..59462448c88 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 61d2bbfc8bf..4756e986745 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 ddf04c77c9a..5774ce3752f 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 d8456cd3de9..e9384fd9b93 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 655204de62b..a84216f4ff0 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 75609a70e8c..6a772d588c8 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 452b79cf3ed..7edbf7fc0d1 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 05ff5606f92..63f14cac0e9 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 d36482eacdf..8da0a3ae2f9 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 605267e143a..7c11ad2c338 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 810becfd24c..f527c2ef19e 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 825fabe8c53..764e15f3770 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 cd066f9193b..2bcb7519abf 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 fbf595fcef9..d87e1483025 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 d28eb134715..bdf2bc0dd4a 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 9d426f969f0..0adbb06e520 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 c6027bd026c..5f8b6bf145d 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 e2c5c3767df..bced2757deb 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 29049aa88d2..f705d408d36 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 fabee8cff34..dafb784860c 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 5e91367ef3f..d881c9527e9 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 ccf48970b95..fc5593ea3b4 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 bc54c0bab1e..753432107bf 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 e031d500bde..b5d32b2053a 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 9bab0588168..065e0c79bac 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 32770b9a4fe..c2740dedd9e 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 b08c900d9f0..6131f1a4576 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 4378e71354b..fe04ad4a09f 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 9dfe00ceb4e..85fae69840d 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 8bd4e8884f4..3d88dfc25cc 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 46343ec4f5d..0fe038caef0 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 1d484b2cc7e..6428b96fcfc 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 aaeada6f4b4..f8b3e61c378 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 b0d9180fe9b..1dabc4bde9d 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 976da0b1b57..b009d7d53e9 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 a9171473ccc..fe538b7072c 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 430c08a1ed9..7e43ef73bfc 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 5c0cda66aa8..d74209d137a 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 4e45870dfca..01f23e7601a 100644 --- a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt +++ b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt @@ -1,5 +1,5 @@ --TEST-- -php_sapi_name() function when switching to webserver by using post +php_sapi_name() function when switching to webserver by using post --POST-- foo=BAR --CREDITS-- diff --git a/ext/tokenizer/tests/token_get_all_basic.phpt b/ext/tokenizer/tests/token_get_all_basic.phpt index 7af8109f896..2e3b1b46727 100644 --- a/ext/tokenizer/tests/token_get_all_basic.phpt +++ b/ext/tokenizer/tests/token_get_all_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test token_get_all() function : basic functionality +Test token_get_all() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("tokenizer")) print "skip"; ?> --FILE-- diff --git a/ext/tokenizer/tests/token_get_all_error.phpt b/ext/tokenizer/tests/token_get_all_error.phpt index 9ded0a17742..35b5048b6be 100644 --- a/ext/tokenizer/tests/token_get_all_error.phpt +++ b/ext/tokenizer/tests/token_get_all_error.phpt @@ -1,11 +1,11 @@ --TEST-- -Test token_get_all() function : error conditions +Test token_get_all() function : error conditions --SKIPIF-- <?php if (!extension_loaded("tokenizer")) print "skip"; ?> --FILE-- <?php /* Prototype : array token_get_all(string $source) - * Description: splits the given source into an array of PHP languange tokens + * Description: splits the given source into an array of PHP languange tokens * Source code: ext/tokenizer/tokenizer.c */ diff --git a/ext/tokenizer/tests/token_get_all_variation1.phpt b/ext/tokenizer/tests/token_get_all_variation1.phpt index 485f112565e..14ece715eb5 100644 --- a/ext/tokenizer/tests/token_get_all_variation1.phpt +++ b/ext/tokenizer/tests/token_get_all_variation1.phpt @@ -5,7 +5,7 @@ Test token_get_all() function : usage variations - unexpected values for 'source --FILE-- <?php /* Prototype : array token_get_all(string $source) - * Description: splits the given source into an array of PHP languange tokens + * Description: splits the given source into an array of PHP languange tokens * Source code: ext/tokenizer/tokenizer.c */ diff --git a/ext/tokenizer/tests/token_get_all_variation11.phpt b/ext/tokenizer/tests/token_get_all_variation11.phpt index 98d89961b77..146e433e12c 100644 --- a/ext/tokenizer/tests/token_get_all_variation11.phpt +++ b/ext/tokenizer/tests/token_get_all_variation11.phpt @@ -10,7 +10,7 @@ Test token_get_all() function : usage variations - with control structure tokens */ /* - * Using different control structure keywords + * Using different control structure keywords * if..else, elseif - T_IF(301), T_ELSEIF(302), T_ELSE(303) * while - T_WHILE(318) * do...while - T_DO(317) diff --git a/ext/tokenizer/tests/token_get_all_variation13.phpt b/ext/tokenizer/tests/token_get_all_variation13.phpt index 6f85492a99a..4c792d59a9c 100644 --- a/ext/tokenizer/tests/token_get_all_variation13.phpt +++ b/ext/tokenizer/tests/token_get_all_variation13.phpt @@ -11,12 +11,12 @@ Test token_get_all() function : usage variations - with class/object constructs /* * Testing token_get_all() with different class/object keywords - * scope related : + * scope related : * static - T_STATIC(346), global - T_GLOBAL(340), * private - T_PRIVATE(343), public - T_PUBLIC(341), * protected - T_PROTECTED(342) - * class/object related : - * var - T_VAR(347), abstract - T_ABSTRACT(345), + * class/object related : + * var - T_VAR(347), abstract - T_ABSTRACT(345), * interface - T_INTERFACE(353), class - T_CLASS(352), * extends - T_EXTENDS(354), implements - T_IMPLEMENTS(355), new - T_NEW(299) */ diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt index fbb50dee862..56269f5d014 100644 --- a/ext/tokenizer/tests/token_get_all_variation15.phpt +++ b/ext/tokenizer/tests/token_get_all_variation15.phpt @@ -1,5 +1,5 @@ --TEST-- -Test token_get_all() function : usage variations - heredoc string for 'source' +Test token_get_all() function : usage variations - heredoc string for 'source' --SKIPIF-- <?php if (!extension_loaded("tokenizer")) print "skip"; ?> --INI-- diff --git a/ext/tokenizer/tests/token_get_all_variation16.phpt b/ext/tokenizer/tests/token_get_all_variation16.phpt index db9bde1ad62..88fa59760fb 100644 --- a/ext/tokenizer/tests/token_get_all_variation16.phpt +++ b/ext/tokenizer/tests/token_get_all_variation16.phpt @@ -12,11 +12,11 @@ Test token_get_all() function : usage variations - with function constructs /* * Testing token_get_all() with different function keywords * function - T_FUNCTION(333), return - T_RETURN(335) - * different functions: - * include() - T_INCLUDE(262), print() - T_PRINT(266), - * isset() - T_ISSET(349), list() - T_LIST(358), - * require() - T_REQUIRE(259), empty() - T_EMPTY(350), - * declare() - T_DECLARE(324), array() - T_ARRAY(359), + * different functions: + * include() - T_INCLUDE(262), print() - T_PRINT(266), + * isset() - T_ISSET(349), list() - T_LIST(358), + * require() - T_REQUIRE(259), empty() - T_EMPTY(350), + * declare() - T_DECLARE(324), array() - T_ARRAY(359), * __halt_compiler() - T_HALT_COMPILER(351) */ diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt index d34508a8d56..bc9f3df65b8 100644 --- a/ext/tokenizer/tests/token_get_all_variation17.phpt +++ b/ext/tokenizer/tests/token_get_all_variation17.phpt @@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with exception keywords /* * Testing token_get_all() with different exception keywords - * try - T_TRY(336), + * try - T_TRY(336), * catch - T_CATCH(337), * throw - T_THROW(338) */ diff --git a/ext/tokenizer/tests/token_get_all_variation18.phpt b/ext/tokenizer/tests/token_get_all_variation18.phpt index 01219ffaa4c..7da1eaac81e 100644 --- a/ext/tokenizer/tests/token_get_all_variation18.phpt +++ b/ext/tokenizer/tests/token_get_all_variation18.phpt @@ -1,5 +1,5 @@ --TEST-- -Test token_get_all() function : usage variations - with HTML code +Test token_get_all() function : usage variations - with HTML code --SKIPIF-- <?php if (!extension_loaded("tokenizer")) print "skip"; ?> --FILE-- diff --git a/ext/tokenizer/tests/token_get_all_variation19.phpt b/ext/tokenizer/tests/token_get_all_variation19.phpt index 9ae6759a8fe..6f4f7b68b34 100644 --- a/ext/tokenizer/tests/token_get_all_variation19.phpt +++ b/ext/tokenizer/tests/token_get_all_variation19.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < 10; $i++) { $token_array = token_get_all($phpstr); $script = ""; -// reconstruct a script (without open/close tags) from the token array +// reconstruct a script (without open/close tags) from the token array foreach ($token_array as $token) { if (is_array($token)) { if (strncmp($token[1], '<?php', 5) == 0) { diff --git a/ext/tokenizer/tests/token_get_all_variation2.phpt b/ext/tokenizer/tests/token_get_all_variation2.phpt index 1f206260c78..401fb7d0950 100644 --- a/ext/tokenizer/tests/token_get_all_variation2.phpt +++ b/ext/tokenizer/tests/token_get_all_variation2.phpt @@ -17,7 +17,7 @@ Test token_get_all() function : usage variations - with different arithmetic ope echo "*** Testing token_get_all() : 'source' string with different arithmetic operators ***\n"; -// arithmetic operators - '+', '-', '*', '/', '%' +// arithmetic operators - '+', '-', '*', '/', '%' $source = array ( '<?php $a = 1 + 2; ?>', '<?php $b = $b - 2; ?>', diff --git a/ext/tokenizer/tests/token_get_all_variation3.phpt b/ext/tokenizer/tests/token_get_all_variation3.phpt index 66cf4aa87f0..f00ed7966fd 100644 --- a/ext/tokenizer/tests/token_get_all_variation3.phpt +++ b/ext/tokenizer/tests/token_get_all_variation3.phpt @@ -11,16 +11,16 @@ Test token_get_all() function : usage variations - with logical operators /* * Passing 'source' argument with different logical operators to test them for tokens - * and - T_AND_LOGICAL_AND(265), - * or - T_LOGICAL_OR(263), - * xor - T_LOGICAL_XOR(264), - * && - T_BOOLEAN_AND(279), + * and - T_AND_LOGICAL_AND(265), + * or - T_LOGICAL_OR(263), + * xor - T_LOGICAL_XOR(264), + * && - T_BOOLEAN_AND(279), * || - T_BOOLEAN_OR(278) */ echo "*** Testing token_get_all() : 'source' string with different logical operators ***\n"; -// logical operators : 'and', 'or', 'xor', '&&', '||' +// logical operators : 'and', 'or', 'xor', '&&', '||' $source = array ( '<?php $a = 1 and 024; ?>', '<?php $b = $b or 0X1E; ?>', diff --git a/ext/tokenizer/tests/token_get_all_variation4.phpt b/ext/tokenizer/tests/token_get_all_variation4.phpt index 6bc111efbac..1ebafaec3ae 100644 --- a/ext/tokenizer/tests/token_get_all_variation4.phpt +++ b/ext/tokenizer/tests/token_get_all_variation4.phpt @@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with comparison operators /* * Passing 'source' argument with different comparison operators to test them for tokens - * == - T_IS_EQUAL(283), === - T_IS_IDENTICAL(281), + * == - T_IS_EQUAL(283), === - T_IS_IDENTICAL(281), * >= - T_IS_GREATER_OR_EQUAL(284), <= - T_IS_LESS_OR_EQUAL(285) * != - T_IS_NOT_EQUAL, <> - T_IS_NOT_EQUAL(282), !== - T_IS_NOT_IDENTICAL(280) */ diff --git a/ext/tokenizer/tests/token_get_all_variation5.phpt b/ext/tokenizer/tests/token_get_all_variation5.phpt index 681fb48e573..2d8121fd80e 100644 --- a/ext/tokenizer/tests/token_get_all_variation5.phpt +++ b/ext/tokenizer/tests/token_get_all_variation5.phpt @@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with assignment operators /* * Passing 'source' argument with different assignment operators to test them for tokens - * += - T_PLUS_EQUAL(277), -= - T_MINUS-EQUAL(276), + * += - T_PLUS_EQUAL(277), -= - T_MINUS-EQUAL(276), * *= - T_MUL_EQUAL(275), /= - T_DIVIDE_EQUAL(274), * %= - T_MOD_EQUAL(272), &= - T_AND_EQUAL(271), * |= - T_OR_EQUAL(271), ^= - T_EXOR_EQUAL(269), diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt index 2d94bbfad35..c95997a8a6c 100644 --- a/ext/xml/tests/bug26614.phpt +++ b/ext/xml/tests/bug26614.phpt @@ -42,7 +42,7 @@ block --> </data>'; -// Case 3: replace even more characters so that only textual data is left +// Case 3: replace even more characters so that only textual data is left $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?> <data> -!-- ATA[ @@ -68,7 +68,7 @@ function endElement($parser, $name) { } function characterData($parser, $data) { - // dummy + // dummy } foreach ($xmls as $desc => $xml) { diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt index c88b154f659..3ddd35ed0ea 100644 --- a/ext/xml/tests/bug26614_libxml.phpt +++ b/ext/xml/tests/bug26614_libxml.phpt @@ -42,7 +42,7 @@ block --> </data>'; -// Case 3: replace even more characters so that only textual data is left +// Case 3: replace even more characters so that only textual data is left $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?> <data> -!-- ATA[ @@ -68,7 +68,7 @@ function endElement($parser, $name) { } function characterData($parser, $data) { - // dummy + // dummy } foreach ($xmls as $desc => $xml) { diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt index 377475bb1c5..1b2510591cb 100644 --- a/ext/xml/tests/xml007.phpt +++ b/ext/xml/tests/xml007.phpt @@ -16,8 +16,8 @@ function startHandler($parser,$tag,$attr) } function endHandler($parser,$tag) -{ - var_dump($tag); +{ + var_dump($tag); } $xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?>< =""></>'; diff --git a/ext/xml/tests/xml_error_string_error.phpt b/ext/xml/tests/xml_error_string_error.phpt index 0aa847c5cf6..369e3cfb7c5 100644 --- a/ext/xml/tests/xml_error_string_error.phpt +++ b/ext/xml/tests/xml_error_string_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_error_string() function : error conditions +Test xml_error_string() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto string xml_error_string(int code) - * Description: Get XML parser error string + * Description: Get XML parser error string * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt index 39b63e3e357..b06bfac8b37 100644 --- a/ext/xml/tests/xml_error_string_variation1.phpt +++ b/ext/xml/tests/xml_error_string_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto string xml_error_string(int code) - * Description: Get XML parser error string + * Description: Get XML parser error string * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_get_current_byte_index_error.phpt b/ext/xml/tests/xml_get_current_byte_index_error.phpt index 08a8f1069e7..3e837ef8b58 100644 --- a/ext/xml/tests/xml_get_current_byte_index_error.phpt +++ b/ext/xml/tests/xml_get_current_byte_index_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_get_current_byte_index() function : error conditions +Test xml_get_current_byte_index() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_byte_index(resource parser) - * Description: Get current byte index for an XML parser + * Description: Get current byte index for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt index 149eeebe42a..720b233db88 100644 --- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt +++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_byte_index(resource parser) - * Description: Get current byte index for an XML parser + * Description: Get current byte index for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -75,7 +75,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_get_current_column_number_error.phpt b/ext/xml/tests/xml_get_current_column_number_error.phpt index 568b6493beb..547b0248a70 100644 --- a/ext/xml/tests/xml_get_current_column_number_error.phpt +++ b/ext/xml/tests/xml_get_current_column_number_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_get_current_column_number() function : error conditions +Test xml_get_current_column_number() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_column_number(resource parser) - * Description: Get current column number for an XML parser + * Description: Get current column number for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt index f421a70c3e7..3825bc39dc2 100644 --- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt +++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_get_current_column_number() function : usage variations +Test xml_get_current_column_number() function : usage variations --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_column_number(resource parser) - * Description: Get current column number for an XML parser + * Description: Get current column number for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -76,7 +76,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_get_current_line_number_error.phpt b/ext/xml/tests/xml_get_current_line_number_error.phpt index 1b79a2a7041..db4fe9fdaf6 100644 --- a/ext/xml/tests/xml_get_current_line_number_error.phpt +++ b/ext/xml/tests/xml_get_current_line_number_error.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_line_number(resource parser) - * Description: Get current line number for an XML parser + * Description: Get current line number for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt index 4b19de57c9a..143b6e092b0 100644 --- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt +++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_current_line_number(resource parser) - * Description: Get current line number for an XML parser + * Description: Get current line number for an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -75,7 +75,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_get_error_code_error.phpt b/ext/xml/tests/xml_get_error_code_error.phpt index 1b58a24ccd1..2e97ba92b64 100644 --- a/ext/xml/tests/xml_get_error_code_error.phpt +++ b/ext/xml/tests/xml_get_error_code_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_get_error_code() function : error conditions +Test xml_get_error_code() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_error_code(resource parser) - * Description: Get XML parser error code + * Description: Get XML parser error code * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt index 6824870159d..a8a4ad47e73 100644 --- a/ext/xml/tests/xml_get_error_code_variation1.phpt +++ b/ext/xml/tests/xml_get_error_code_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_get_error_code(resource parser) - * Description: Get XML parser error code + * Description: Get XML parser error code * Source code: ext/xml/xml.c * Alias to functions: */ @@ -75,7 +75,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parse_error.phpt b/ext/xml/tests/xml_parse_error.phpt index aa1debdb5a5..e5036ddbeb6 100644 --- a/ext/xml/tests/xml_parse_error.phpt +++ b/ext/xml/tests/xml_parse_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parse() function : error conditions +Test xml_parse() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parse(resource parser, string data [, int isFinal]) - * Description: Start parsing an XML document + * Description: Start parsing an XML document * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parse_into_struct_error.phpt b/ext/xml/tests/xml_parse_into_struct_error.phpt index 311486f3bba..56d943d00f3 100644 --- a/ext/xml/tests/xml_parse_into_struct_error.phpt +++ b/ext/xml/tests/xml_parse_into_struct_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parse_into_struct() function : error conditions +Test xml_parse_into_struct() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) - * Description: Parsing a XML document + * Description: Parsing a XML document * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt index e78a00ab9e1..eadc3edc944 100644 --- a/ext/xml/tests/xml_parse_into_struct_variation.phpt +++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parse_into_struct() function : variation +Test xml_parse_into_struct() function : variation --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) - * Description: Parsing a XML document + * Description: Parsing a XML document * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt index bc7c8175160..0cb22a5371e 100644 --- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt +++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index) - * Description: Parsing a XML document + * Description: Parsing a XML document * Source code: ext/xml/xml.c * Alias to functions: */ @@ -76,7 +76,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt index 69aae7403bd..685a50eed19 100644 --- a/ext/xml/tests/xml_parse_variation1.phpt +++ b/ext/xml/tests/xml_parse_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parse(resource parser, string data [, int isFinal]) - * Description: Start parsing an XML document + * Description: Start parsing an XML document * Source code: ext/xml/xml.c * Alias to functions: */ @@ -77,7 +77,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_create_error.phpt b/ext/xml/tests/xml_parser_create_error.phpt index 820a3c1b1b3..ac64294639c 100644 --- a/ext/xml/tests/xml_parser_create_error.phpt +++ b/ext/xml/tests/xml_parser_create_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parser_create() function : error conditions +Test xml_parser_create() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto resource xml_parser_create([string encoding]) - * Description: Create an XML parser + * Description: Create an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_create_ns_error.phpt b/ext/xml/tests/xml_parser_create_ns_error.phpt index 2349e0df3c0..f1fd3f00fe4 100644 --- a/ext/xml/tests/xml_parser_create_ns_error.phpt +++ b/ext/xml/tests/xml_parser_create_ns_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parser_create_ns() function : error conditions +Test xml_parser_create_ns() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto resource xml_parser_create_ns([string encoding [, string sep]]) - * Description: Create an XML parser + * Description: Create an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_create_ns_variation1.phpt b/ext/xml/tests/xml_parser_create_ns_variation1.phpt index 098df877a12..430bebe6765 100644 --- a/ext/xml/tests/xml_parser_create_ns_variation1.phpt +++ b/ext/xml/tests/xml_parser_create_ns_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto resource xml_parser_create_ns([string encoding [, string sep]]) - * Description: Create an XML parser + * Description: Create an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -79,7 +79,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_create_variation1.phpt b/ext/xml/tests/xml_parser_create_variation1.phpt index 641dbf4578c..2caefa0d82d 100644 --- a/ext/xml/tests/xml_parser_create_variation1.phpt +++ b/ext/xml/tests/xml_parser_create_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto resource xml_parser_create([string encoding]) - * Description: Create an XML parser + * Description: Create an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -79,7 +79,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_free_error.phpt b/ext/xml/tests/xml_parser_free_error.phpt index 602fa900b19..f1a1846a3b1 100644 --- a/ext/xml/tests/xml_parser_free_error.phpt +++ b/ext/xml/tests/xml_parser_free_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parser_free() function : error conditions +Test xml_parser_free() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_free(resource parser) - * Description: Free an XML parser + * Description: Free an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt index 5db31f902c9..be14effc8af 100644 --- a/ext/xml/tests/xml_parser_free_variation1.phpt +++ b/ext/xml/tests/xml_parser_free_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_free(resource parser) - * Description: Free an XML parser + * Description: Free an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -75,7 +75,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_get_option_error.phpt b/ext/xml/tests/xml_parser_get_option_error.phpt index ff289e9635f..2455dd5d32c 100644 --- a/ext/xml/tests/xml_parser_get_option_error.phpt +++ b/ext/xml/tests/xml_parser_get_option_error.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) - * Description: Get options from an XML parser + * Description: Get options from an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt index 8983c428f26..853548f0101 100644 --- a/ext/xml/tests/xml_parser_get_option_variation1.phpt +++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) - * Description: Get options from an XML parser + * Description: Get options from an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -76,7 +76,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt index c792a0a1301..f3307c4b7f5 100644 --- a/ext/xml/tests/xml_parser_get_option_variation2.phpt +++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_get_option(resource parser, int option) - * Description: Get options from an XML parser + * Description: Get options from an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -74,7 +74,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt index d51309d0221..48d91eafb6a 100644 --- a/ext/xml/tests/xml_parser_set_option_basic.phpt +++ b/ext/xml/tests/xml_parser_set_option_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_notation_decl_handler function : basic +Test xml_set_notation_decl_handler function : basic --SKIPIF-- <?php if (!extension_loaded("xml")) { diff --git a/ext/xml/tests/xml_parser_set_option_error.phpt b/ext/xml/tests/xml_parser_set_option_error.phpt index 9f6498e9617..6c68252c139 100644 --- a/ext/xml/tests/xml_parser_set_option_error.phpt +++ b/ext/xml/tests/xml_parser_set_option_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_parser_set_option() function : error conditions +Test xml_parser_set_option() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) - * Description: Set options in an XML parser + * Description: Set options in an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt index 6843fda3f22..c5159f6a53f 100644 --- a/ext/xml/tests/xml_parser_set_option_variation1.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) - * Description: Set options in an XML parser + * Description: Set options in an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -76,7 +76,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt index 40f6edf8c89..043ab287df3 100644 --- a/ext/xml/tests/xml_parser_set_option_variation2.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt @@ -10,7 +10,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) - * Description: Set options in an XML parser + * Description: Set options in an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt index 262a820ce3a..836ee7a4691 100644 --- a/ext/xml/tests/xml_parser_set_option_variation3.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_parser_set_option(resource parser, int option, mixed value) - * Description: Set options in an XML parser + * Description: Set options in an XML parser * Source code: ext/xml/xml.c * Alias to functions: */ @@ -78,7 +78,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_character_data_handler_error.phpt b/ext/xml/tests/xml_set_character_data_handler_error.phpt index d4e91ac2d59..a0597386acb 100644 --- a/ext/xml/tests/xml_set_character_data_handler_error.phpt +++ b/ext/xml/tests/xml_set_character_data_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_character_data_handler() function : error conditions +Test xml_set_character_data_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_character_data_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt index c06f0a96b5b..6519f83cb66 100644 --- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_character_data_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_default_handler_error.phpt b/ext/xml/tests/xml_set_default_handler_error.phpt index 9ca7819580d..3adc40a6c72 100644 --- a/ext/xml/tests/xml_set_default_handler_error.phpt +++ b/ext/xml/tests/xml_set_default_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_default_handler() function : error conditions +Test xml_set_default_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_default_handler(resource parser, string hdl) - * Description: Set up default handler + * Description: Set up default handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt index 2f9a3d5777b..83b73cc4c34 100644 --- a/ext/xml/tests/xml_set_default_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_default_handler(resource parser, string hdl) - * Description: Set up default handler + * Description: Set up default handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_element_handler_error.phpt b/ext/xml/tests/xml_set_element_handler_error.phpt index 00a64163ff4..7661df8ea6f 100644 --- a/ext/xml/tests/xml_set_element_handler_error.phpt +++ b/ext/xml/tests/xml_set_element_handler_error.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_element_handler(resource parser, string shdl, string ehdl) - * Description: Set up start and end element handlers + * Description: Set up start and end element handlers * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt index 461b8fab6e1..e8797b4225f 100644 --- a/ext/xml/tests/xml_set_element_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_element_handler(resource parser, string shdl, string ehdl) - * Description: Set up start and end element handlers + * Description: Set up start and end element handlers * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt index 4e69c295633..35f923d72ca 100644 --- a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_end_namespace_decl_handler() function : error conditions +Test xml_set_end_namespace_decl_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt index c9c9fa862d8..fa1a411c4b6 100644 --- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt index 75cfcaabd4f..7ba32b9a1e4 100644 --- a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt +++ b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_external_entity_ref_handler() function : error conditions +Test xml_set_external_entity_ref_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_external_entity_ref_handler(resource parser, string hdl) - * Description: Set up external entity reference handler + * Description: Set up external entity reference handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt index f1cef86bf61..a724e316baa 100644 --- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_external_entity_ref_handler(resource parser, string hdl) - * Description: Set up external entity reference handler + * Description: Set up external entity reference handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt index 9414216bebe..a4ea86375e7 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_notation_decl_handler function : basic +Test xml_set_notation_decl_handler function : basic --SKIPIF-- <?php if (!extension_loaded("xml")) { diff --git a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt index e3aff7d4f3b..60fc4383a7e 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_notation_decl_handler() function : error conditions +Test xml_set_notation_decl_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_notation_decl_handler(resource parser, string hdl) - * Description: Set up notation declaration handler + * Description: Set up notation declaration handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt index b7668dd4b0a..82811050811 100644 --- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_notation_decl_handler(resource parser, string hdl) - * Description: Set up notation declaration handler + * Description: Set up notation declaration handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_object_error.phpt b/ext/xml/tests/xml_set_object_error.phpt index f9f056ba92c..39a8511218a 100644 --- a/ext/xml/tests/xml_set_object_error.phpt +++ b/ext/xml/tests/xml_set_object_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_object() function : error conditions +Test xml_set_object() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) - * Description: Set up object which should be used for callbacks + * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt index 2c90b8cc38a..bdea52cc8df 100644 --- a/ext/xml/tests/xml_set_object_variation1.phpt +++ b/ext/xml/tests/xml_set_object_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) - * Description: Set up object which should be used for callbacks + * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c * Alias to functions: */ @@ -76,7 +76,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt index fe428ec8a19..83af35b93d8 100644 --- a/ext/xml/tests/xml_set_object_variation2.phpt +++ b/ext/xml/tests/xml_set_object_variation2.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_object(resource parser, object &obj) - * Description: Set up object which should be used for callbacks + * Description: Set up object which should be used for callbacks * Source code: ext/xml/xml.c * Alias to functions: */ @@ -68,7 +68,7 @@ $values = array( 'string', // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt index 61193c079fe..d38085d26c0 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_processing_instruction_handler function : basic +Test xml_set_processing_instruction_handler function : basic --SKIPIF-- <?php if (!extension_loaded("xml")) { diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt index 0d6deb9fd85..561bd354728 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_processing_instruction_handler() function : error conditions +Test xml_set_processing_instruction_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_processing_instruction_handler(resource parser, string hdl) - * Description: Set up processing instruction (PI) handler + * Description: Set up processing instruction (PI) handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt index 227337b3387..8bc93c72e54 100644 --- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_processing_instruction_handler(resource parser, string hdl) - * Description: Set up processing instruction (PI) handler + * Description: Set up processing instruction (PI) handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt index 9fa02f66abc..08ea65f8bbe 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_start_namespace_decl_handler function: basic +Test xml_set_start_namespace_decl_handler function: basic --SKIPIF-- <?php if (!extension_loaded("xml")) { diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt index 3b4163e1efc..e3cab09be27 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test xml_set_start_namespace_decl_handler() function : error conditions +Test xml_set_start_namespace_decl_handler() function : error conditions --SKIPIF-- <?php if (!extension_loaded("xml")) { @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt index 90faa2caf28..0600362cb8c 100644 --- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl) - * Description: Set up character data handler + * Description: Set up character data handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt index a8119ca3444..c0aac2339e9 100644 --- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt +++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) - * Description: Set up unparsed entity declaration handler + * Description: Set up unparsed entity declaration handler * Source code: ext/xml/xml.c * Alias to functions: */ diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt index 1f9fe4bfd36..ed58275dcc7 100644 --- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt +++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("xml")) { --FILE-- <?php /* Prototype : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl) - * Description: Set up unparsed entity declaration handler + * Description: Set up unparsed entity declaration handler * Source code: ext/xml/xml.c * Alias to functions: */ @@ -80,7 +80,7 @@ $values = array( new aClass(), // resource data - $fp, + $fp, // undefined data $undefined_var, diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt index 64f59ee26a3..fa87eba8b41 100644 --- a/ext/xmlreader/tests/001.phpt +++ b/ext/xmlreader/tests/001.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, string data +XMLReader: libxml2 XML Reader, string data --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt index 48e1e4f74e8..23c43373a0d 100644 --- a/ext/xmlreader/tests/002.phpt +++ b/ext/xmlreader/tests/002.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, file data +XMLReader: libxml2 XML Reader, file data --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt index 3dba1f5dafb..905f8fd03e3 100644 --- a/ext/xmlreader/tests/003-mb.phpt +++ b/ext/xmlreader/tests/003-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, attributes test +XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt index 8e5b18f68b5..3dc8caf55ab 100644 --- a/ext/xmlreader/tests/003.phpt +++ b/ext/xmlreader/tests/003.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, attributes test +XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt index 13d9024304f..92989458479 100644 --- a/ext/xmlreader/tests/004.phpt +++ b/ext/xmlreader/tests/004.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, attributes test +XMLReader: libxml2 XML Reader, attributes test --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt index 07a616acff0..ea34f89108c 100644 --- a/ext/xmlreader/tests/005.phpt +++ b/ext/xmlreader/tests/005.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, parser property set/get +XMLReader: libxml2 XML Reader, parser property set/get --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt index f3c37f7dad3..fce705c2625 100644 --- a/ext/xmlreader/tests/006.phpt +++ b/ext/xmlreader/tests/006.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, moveToElement +XMLReader: libxml2 XML Reader, moveToElement --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- @@ -12,7 +12,7 @@ $reader = new XMLReader(); $reader->XML($xmlstring); -// 2 read to get on the 2nd node +// 2 read to get on the 2nd node $reader->read(); $reader->read(); diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt index e3a29c8e4fa..fd3da461843 100644 --- a/ext/xmlreader/tests/008.phpt +++ b/ext/xmlreader/tests/008.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, DTD +XMLReader: libxml2 XML Reader, DTD --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt index 937e7718355..e988563b42a 100644 --- a/ext/xmlreader/tests/009.phpt +++ b/ext/xmlreader/tests/009.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, next +XMLReader: libxml2 XML Reader, next --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt index 085a3ac38fe..4a1ebe174ee 100644 --- a/ext/xmlreader/tests/010.phpt +++ b/ext/xmlreader/tests/010.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, next +XMLReader: libxml2 XML Reader, next --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt index 016c7cd334e..658c37f03be 100644 --- a/ext/xmlreader/tests/011.phpt +++ b/ext/xmlreader/tests/011.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: libxml2 XML Reader, string data +XMLReader: libxml2 XML Reader, string data --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; $reader = new XMLReader(); diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt index cb0d121e83d..50b761c2358 100644 --- a/ext/xmlreader/tests/012.phpt +++ b/ext/xmlreader/tests/012.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLReader: accessing empty and non existing attributes +XMLReader: accessing empty and non existing attributes --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; ?> --FILE-- diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt index eaa10920b50..ac9f6a3f844 100644 --- a/ext/xmlwriter/tests/005-mb.phpt +++ b/ext/xmlwriter/tests/005-mb.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter: libxml2 XML Writer, comments +XMLWriter: libxml2 XML Writer, comments --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) die("skip"); diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt index 278eaf96480..a2d3d1766a0 100644 --- a/ext/xmlwriter/tests/005.phpt +++ b/ext/xmlwriter/tests/005.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter: libxml2 XML Writer, comments +XMLWriter: libxml2 XML Writer, comments --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) die("skip"); diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt index 9b32be3aee6..2f0d65e6817 100644 --- a/ext/xmlwriter/tests/006.phpt +++ b/ext/xmlwriter/tests/006.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter: libxml2 XML Writer, startDTD/writeElementNS +XMLWriter: libxml2 XML Writer, startDTD/writeElementNS --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) die("skip"); diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt index e84628d4461..e3250e70e21 100644 --- a/ext/xmlwriter/tests/OO_005.phpt +++ b/ext/xmlwriter/tests/OO_005.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter: libxml2 XML Writer, comments +XMLWriter: libxml2 XML Writer, comments --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) die("skip"); diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt index 1b543192b17..4b8e0d9a156 100644 --- a/ext/xmlwriter/tests/OO_006.phpt +++ b/ext/xmlwriter/tests/OO_006.phpt @@ -1,5 +1,5 @@ --TEST-- -XMLWriter: libxml2 XML Writer, startDTD/writeElementNS +XMLWriter: libxml2 XML Writer, startDTD/writeElementNS --SKIPIF-- <?php if (!extension_loaded("xmlwriter")) die("skip"); diff --git a/ext/xsl/tests/bug54446.phpt b/ext/xsl/tests/bug54446.phpt index 61a79a9e11f..dc027fdebd7 100644 --- a/ext/xsl/tests/bug54446.phpt +++ b/ext/xsl/tests/bug54446.phpt @@ -30,10 +30,10 @@ EOT; $xsl->loadXML( $sXsl ); -# START XSLT +# START XSLT $proc->importStylesheet( $xsl ); -# TRASNFORM & PRINT +# TRASNFORM & PRINT print $proc->transformToXML( $dom ); @@ -46,7 +46,7 @@ if (file_exists($outputfile)) { #SET NO SECURITY PREFS $proc->setSecurityPrefs(XSL_SECPREF_NONE); -# TRASNFORM & PRINT +# TRASNFORM & PRINT print $proc->transformToXML( $dom ); @@ -61,7 +61,7 @@ unlink($outputfile); #SET SECURITY PREFS AGAIN $proc->setSecurityPrefs( XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); -# TRASNFORM & PRINT +# TRASNFORM & PRINT print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt index bed6a7d34eb..4de826dce9d 100644 --- a/ext/xsl/tests/bug54446_with_ini.phpt +++ b/ext/xsl/tests/bug54446_with_ini.phpt @@ -30,10 +30,10 @@ EOT; $xsl->loadXML( $sXsl ); -# START XSLT +# START XSLT $proc->importStylesheet( $xsl ); -# TRASNFORM & PRINT +# TRASNFORM & PRINT print $proc->transformToXML( $dom ); @@ -46,7 +46,7 @@ if (file_exists($outputfile)) { #SET NO SECURITY PREFS $proc->setSecurityPrefs(XSL_SECPREF_NONE); -# TRANSFORM & PRINT +# TRANSFORM & PRINT print $proc->transformToXML( $dom ); @@ -61,7 +61,7 @@ unlink($outputfile); #SET SECURITY PREFS AGAIN $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY); -# TRANSFORM & PRINT +# TRANSFORM & PRINT print $proc->transformToXML( $dom ); if (file_exists($outputfile)) { diff --git a/ext/xsl/tests/xslt010.phpt b/ext/xsl/tests/xslt010.phpt index adabbf55a07..a805e9fbaa3 100644 --- a/ext/xsl/tests/xslt010.phpt +++ b/ext/xsl/tests/xslt010.phpt @@ -1,7 +1,7 @@ --TEST-- Test 10: EXSLT Support --SKIPIF-- -<?php +<?php require_once dirname(__FILE__) .'/skipif.inc'; $proc = new xsltprocessor; if (!$proc->hasExsltSupport()) die('skip EXSLT support not available'); @@ -16,10 +16,10 @@ $dom = new domDocument(); $dom->load(dirname(__FILE__)."/exslt.xsl"); $proc = new xsltprocessor; $xsl = $proc->importStylesheet($dom); - + $xml = new DomDocument(); $xml->load(dirname(__FILE__)."/exslt.xml"); - + print $proc->transformToXml($xml); --EXPECT-- Test 10: EXSLT Support diff --git a/ext/xsl/tests/xslt010_gt10129.phpt b/ext/xsl/tests/xslt010_gt10129.phpt index 68ea6218dbf..a04f2899849 100644 --- a/ext/xsl/tests/xslt010_gt10129.phpt +++ b/ext/xsl/tests/xslt010_gt10129.phpt @@ -1,7 +1,7 @@ --TEST-- Test 10: EXSLT Support --SKIPIF-- -<?php +<?php require_once dirname(__FILE__) .'/skipif.inc'; $proc = new xsltprocessor; if (!$proc->hasExsltSupport()) die('skip EXSLT support not available'); @@ -15,10 +15,10 @@ $dom = new domDocument(); $dom->load(dirname(__FILE__)."/exslt.xsl"); $proc = new xsltprocessor; $xsl = $proc->importStylesheet($dom); - + $xml = new DomDocument(); $xml->load(dirname(__FILE__)."/exslt.xml"); - + print $proc->transformToXml($xml); --EXPECT-- Test 10: EXSLT Support diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt index 84fc3b5f10f..24d272ece01 100644 --- a/ext/zlib/tests/005.phpt +++ b/ext/zlib/tests/005.phpt @@ -1,5 +1,5 @@ --TEST-- -gzcompress()/gzuncompress() and invalid params +gzcompress()/gzuncompress() and invalid params --SKIPIF-- <?php if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt index ec5d8dc577f..0d082092ca3 100644 --- a/ext/zlib/tests/006.phpt +++ b/ext/zlib/tests/006.phpt @@ -1,5 +1,5 @@ --TEST-- -gzdeflate()/gzinflate() and invalid params +gzdeflate()/gzinflate() and invalid params --SKIPIF-- <?php if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- diff --git a/ext/zlib/tests/bug60761.phpt b/ext/zlib/tests/bug60761.phpt index 14c45cb4c88..3e14bc2cdb0 100644 --- a/ext/zlib/tests/bug60761.phpt +++ b/ext/zlib/tests/bug60761.phpt @@ -36,11 +36,11 @@ echo "Compressed Lengths\n"; // pass == only ONE length for all iterations // (length didn't change during run) -// +// // hard to anticipate what 'correct' length should be since // return value of phpinfo() will vary between installations... // just check that there is only one length -// +// var_dump($lens); // show lengths to help triage in case of failure // expected headers since its CGI diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt index 68bd53791d5..4edc147db9b 100644 --- a/ext/zlib/tests/bug_52944.phpt +++ b/ext/zlib/tests/bug_52944.phpt @@ -6,7 +6,7 @@ Bug #52944 (segfault with zlib filter and corrupted data) allow_url_fopen=1 --FILE-- <?php -/* NOTE this test can fail on asm builds of zlib 1.2.5 or +/* NOTE this test can fail on asm builds of zlib 1.2.5 or 1.2.7 on at least Windows and Darwin. Using unoptimized zlib build fixes the issue. */ diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt index 4bd3206bee8..9d5fcedcf8a 100644 --- a/ext/zlib/tests/gzcompress_basic1.phpt +++ b/ext/zlib/tests/gzcompress_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzcompress() function : basic functionality +Test gzcompress() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt index 93c22964b6a..3f742a4dca5 100644 --- a/ext/zlib/tests/gzcompress_error1.phpt +++ b/ext/zlib/tests/gzcompress_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzcompress() function : error conditions +Test gzcompress() function : error conditions --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt index 1b234797c22..de1671545a7 100644 --- a/ext/zlib/tests/gzcompress_variation1.phpt +++ b/ext/zlib/tests/gzcompress_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzcompress() function : variation +Test gzcompress() function : variation --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzcompress(string data [, int level, [int encoding]]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt index a1b89b93768..5f25a1880b7 100644 --- a/ext/zlib/tests/gzdeflate_basic1.phpt +++ b/ext/zlib/tests/gzdeflate_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzdeflate() function : basic functionality +Test gzdeflate() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level, [int encoding]]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt index 00e3c01e1a6..93f8c03b4c7 100644 --- a/ext/zlib/tests/gzdeflate_error1.phpt +++ b/ext/zlib/tests/gzdeflate_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzdeflate() function : error conditions +Test gzdeflate() function : error conditions --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level, [int encoding]]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt index c751a1b92f1..dc8b9d1fcd2 100644 --- a/ext/zlib/tests/gzdeflate_variation1.phpt +++ b/ext/zlib/tests/gzdeflate_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzdeflate() function : variation +Test gzdeflate() function : variation --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzdeflate(string data [, int level]) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt index e53dfde2abd..c6040135f06 100644 --- a/ext/zlib/tests/gzencode_basic1.phpt +++ b/ext/zlib/tests/gzencode_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzencode() function : basic functionality +Test gzencode() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ @@ -34,7 +34,7 @@ for($i = -1; $i < 10; $i++) { echo "-- Compression level $i --\n"; $output = gzencode($data, $i); - // Clear OS byte before encode + // Clear OS byte before encode $output[9] = "\x00"; var_dump(md5($output)); @@ -45,7 +45,7 @@ for($i = -1; $i < 10; $i++) { echo "-- Compression level $i --\n"; $output = gzencode($smallstring, $i); - // Clear OS byte before encode + // Clear OS byte before encode $output[9] = "\x00"; var_dump(md5($output)); diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt index 2cd6a9ede9c..ac846866c54 100644 --- a/ext/zlib/tests/gzencode_error1.phpt +++ b/ext/zlib/tests/gzencode_error1.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzencode_variation1-win32.phpt b/ext/zlib/tests/gzencode_variation1-win32.phpt index c2276b2b0aa..4feb7d653c0 100644 --- a/ext/zlib/tests/gzencode_variation1-win32.phpt +++ b/ext/zlib/tests/gzencode_variation1-win32.phpt @@ -14,7 +14,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt index c2a995a46b3..1c82da98f88 100644 --- a/ext/zlib/tests/gzencode_variation1.phpt +++ b/ext/zlib/tests/gzencode_variation1.phpt @@ -14,7 +14,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt index 9ca4d10c4c1..9936ec8d3bd 100644 --- a/ext/zlib/tests/gzencode_variation2-win32.phpt +++ b/ext/zlib/tests/gzencode_variation2-win32.phpt @@ -19,7 +19,7 @@ if (version_compare(get_zlib_version(), "1.2.11") < 0) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt index 128fe472e97..94ac42a5f1c 100644 --- a/ext/zlib/tests/gzencode_variation2.phpt +++ b/ext/zlib/tests/gzencode_variation2.phpt @@ -14,7 +14,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzencode ( string $data [, int $level [, int $encoding_mode ]] ) - * Description: Gzip-compress a string + * Description: Gzip-compress a string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt index ed7ece218c5..a866ba26c43 100644 --- a/ext/zlib/tests/gzfile_variation2.phpt +++ b/ext/zlib/tests/gzfile_variation2.phpt @@ -8,7 +8,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b <?php -$use_include_path = +$use_include_path = $variation = array( diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt index 24b929ff9d5..92a5b8dcfdd 100644 --- a/ext/zlib/tests/gzinflate_error1.phpt +++ b/ext/zlib/tests/gzinflate_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzinflate() function : error conditions +Test gzinflate() function : error conditions --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzinflate(string data [, int length]) - * Description: Unzip a gzip-compressed string + * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_basic.phpt b/ext/zlib/tests/gzopen_basic.phpt index dece6f5ea5c..d41e1c40de4 100644 --- a/ext/zlib/tests/gzopen_basic.phpt +++ b/ext/zlib/tests/gzopen_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzopen() function : basic functionality +Test gzopen() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt index f9b4cd2a586..dd3ba182355 100644 --- a/ext/zlib/tests/gzopen_basic2.phpt +++ b/ext/zlib/tests/gzopen_basic2.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_error.phpt b/ext/zlib/tests/gzopen_error.phpt index cda7c36e4ef..02f125d6b04 100644 --- a/ext/zlib/tests/gzopen_error.phpt +++ b/ext/zlib/tests/gzopen_error.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzopen() function : error conditions +Test gzopen() function : error conditions --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_variation2.phpt b/ext/zlib/tests/gzopen_variation2.phpt index fc350049e79..1fd08455ebf 100644 --- a/ext/zlib/tests/gzopen_variation2.phpt +++ b/ext/zlib/tests/gzopen_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzopen() function : usage variation +Test gzopen() function : usage variation --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ @@ -104,7 +104,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for mode diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt index 5201c58c813..824d4e333e6 100644 --- a/ext/zlib/tests/gzopen_variation3.phpt +++ b/ext/zlib/tests/gzopen_variation3.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzopen() function : usage variation +Test gzopen() function : usage variation --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only'); --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ @@ -105,7 +105,7 @@ $inputs = array( 'unset var' => @$unset_var, // resource variable - 'resource' => $fp + 'resource' => $fp ); // loop through each element of the array for use_include_path diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt index 2ccd0f311a0..bf374eee018 100644 --- a/ext/zlib/tests/gzopen_variation4.phpt +++ b/ext/zlib/tests/gzopen_variation4.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt index 2e764bb0a45..c223efeb15d 100644 --- a/ext/zlib/tests/gzopen_variation5.phpt +++ b/ext/zlib/tests/gzopen_variation5.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_variation6.phpt b/ext/zlib/tests/gzopen_variation6.phpt index 2ff7e62cf2d..07f873a8dd9 100644 --- a/ext/zlib/tests/gzopen_variation6.phpt +++ b/ext/zlib/tests/gzopen_variation6.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzopen() function : variation: relative/absolute file +Test gzopen() function : variation: relative/absolute file --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_variation8.phpt b/ext/zlib/tests/gzopen_variation8.phpt index 02be5db1970..bb64ecab16a 100644 --- a/ext/zlib/tests/gzopen_variation8.phpt +++ b/ext/zlib/tests/gzopen_variation8.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt index 638c4848a55..7359a98cfaa 100644 --- a/ext/zlib/tests/gzopen_variation9.phpt +++ b/ext/zlib/tests/gzopen_variation9.phpt @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : resource gzopen(string filename, string mode [, int use_include_path]) - * Description: Open a .gz-file and return a .gz-file pointer + * Description: Open a .gz-file and return a .gz-file pointer * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzseek_variation6.phpt b/ext/zlib/tests/gzseek_variation6.phpt index c0b983e4e99..bb5d9ed65b8 100644 --- a/ext/zlib/tests/gzseek_variation6.phpt +++ b/ext/zlib/tests/gzseek_variation6.phpt @@ -10,7 +10,7 @@ if (!extension_loaded("zlib")) { <?php $f = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($f, 'r'); -// move 40 bytes +// move 40 bytes echo "move 40 bytes\n"; gzread($h, 40); echo "tell="; diff --git a/ext/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt index 222f55dd845..43bc6eb9ab7 100644 --- a/ext/zlib/tests/gzuncompress_basic1.phpt +++ b/ext/zlib/tests/gzuncompress_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzuncompress() function : basic functionality +Test gzuncompress() function : basic functionality --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzuncompress(string data [, int length]) - * Description: Unzip a gzip-compressed string + * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt index 5961673abb5..f200951d4c9 100644 --- a/ext/zlib/tests/gzuncompress_error1.phpt +++ b/ext/zlib/tests/gzuncompress_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test gzuncompress() function : error conditions +Test gzuncompress() function : error conditions --SKIPIF-- <?php if (!extension_loaded("zlib")) { @@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) { --FILE-- <?php /* Prototype : string gzuncompress(string data [, int length]) - * Description: Unzip a gzip-compressed string + * Description: Unzip a gzip-compressed string * Source code: ext/zlib/zlib.c * Alias to functions: */ diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt index 88a82f0182b..95c6f4cc43e 100644 --- a/ext/zlib/tests/readgzfile_variation2.phpt +++ b/ext/zlib/tests/readgzfile_variation2.phpt @@ -8,7 +8,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b <?php -$use_include_path = +$use_include_path = $variation = array( diff --git a/ext/zlib/tests/zlib_filter_deflate2.phpt b/ext/zlib/tests/zlib_filter_deflate2.phpt index 764a7606f42..f0bf9b0a29c 100644 --- a/ext/zlib/tests/zlib_filter_deflate2.phpt +++ b/ext/zlib/tests/zlib_filter_deflate2.phpt @@ -11,6 +11,6 @@ stream_filter_append($fp, 'zlib.deflate', STREAM_FILTER_WRITE, array('level' => fwrite($fp, $text); fclose($fp); -?> ---EXPECT-- +?> +--EXPECT-- A Dѫ΍1MBUv_(EL/aP=Pi ;6fCe4U9;w5 m / diff --git a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt index 6e665cee71a..4c185be6893 100644 --- a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt +++ b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test function fstat() on zlib wrapper +Test function fstat() on zlib wrapper --SKIPIF-- <?php if (!extension_loaded("zlib")) { diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index ddcae81ed89..c316e213e33 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -1,5 +1,5 @@ --TEST-- -executing a file with -F +executing a file with -F --SKIPIF-- <?php include "skipif.inc"; diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt index 40f079e28d4..ea735d8d6e2 100644 --- a/sapi/cli/tests/016.phpt +++ b/sapi/cli/tests/016.phpt @@ -1,5 +1,5 @@ --TEST-- -CLI -a and readline +CLI -a and readline --SKIPIF-- <?php include "skipif.inc"; diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt index f3c3b60e8b7..684e41691e3 100644 --- a/sapi/cli/tests/017.phpt +++ b/sapi/cli/tests/017.phpt @@ -1,5 +1,5 @@ --TEST-- -CLI -a and libedit +CLI -a and libedit --SKIPIF-- <?php include "skipif.inc"; diff --git a/sapi/cli/tests/018.phpt b/sapi/cli/tests/018.phpt index 8d0e10bc0a1..9ebe4faa87f 100644 --- a/sapi/cli/tests/018.phpt +++ b/sapi/cli/tests/018.phpt @@ -1,5 +1,5 @@ --TEST-- -CLI php -m +CLI php -m --SKIPIF-- <?php include "skipif.inc"; diff --git a/sapi/cli/tests/019.phpt b/sapi/cli/tests/019.phpt index 34a4714dd38..2b8c0f007ec 100644 --- a/sapi/cli/tests/019.phpt +++ b/sapi/cli/tests/019.phpt @@ -1,5 +1,5 @@ --TEST-- -CLI php -i +CLI php -i --SKIPIF-- <?php include "skipif.inc"; diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt index c8ceb43d04a..ac23e77f6a2 100644 --- a/sapi/cli/tests/020.phpt +++ b/sapi/cli/tests/020.phpt @@ -1,5 +1,5 @@ --TEST-- -CLI php --ri +CLI php --ri --SKIPIF-- <?php include "skipif.inc"; diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt index 41a6713ae5e..c74e1e414dd 100644 --- a/tests/basic/015.phpt +++ b/tests/basic/015.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 3 +POST Method test and arrays - 3 --POST-- a[]=1&a[0]=5 --FILE-- diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt index f7b301d84ed..7c814445184 100644 --- a/tests/basic/016.phpt +++ b/tests/basic/016.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 4 +POST Method test and arrays - 4 --POST-- a[a]=1&a[b]=3 --FILE-- diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt index b7595ff2e1f..ca0a2d6491b 100644 --- a/tests/basic/017.phpt +++ b/tests/basic/017.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 5 +POST Method test and arrays - 5 --POST-- a[]=1&a[a]=1&a[b]=3 --FILE-- diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt index 5617adeec82..93bca86da15 100644 --- a/tests/basic/018.phpt +++ b/tests/basic/018.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 6 +POST Method test and arrays - 6 --POST-- a[][]=1&a[][]=3&b[a][b][c]=1&b[a][b][d]=1 --FILE-- diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt index 3c13b798014..0c90c4907a3 100644 --- a/tests/basic/019.phpt +++ b/tests/basic/019.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 7 +POST Method test and arrays - 7 --POST-- a[]=1&a[]]=3&a[[]=4 --FILE-- diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt index 26430ef6729..3a4d7f455b1 100644 --- a/tests/basic/020.phpt +++ b/tests/basic/020.phpt @@ -1,5 +1,5 @@ --TEST-- -POST Method test and arrays - 8 +POST Method test and arrays - 8 --POST-- a[a[]]=1&a[b[]]=3 --FILE-- diff --git a/tests/basic/bug45986.phpt b/tests/basic/bug45986.phpt index 33c3f27eac8..e63b1b3906f 100644 --- a/tests/basic/bug45986.phpt +++ b/tests/basic/bug45986.phpt @@ -3,7 +3,7 @@ Bug #45986 (wrong error message for a non existent file on rename) --CREDITS-- Sebastian Schürmann sebs@php.net -Testfest 2009 Munich +Testfest 2009 Munich --FILE-- <?php rename('foo', 'bar'); diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index c80801f7cfb..30662add369 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Force pass-by-reference to __call +Force pass-by-reference to __call --FILE-- <?php class C diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt index 6e1584878e1..33c4df8e493 100644 --- a/tests/classes/__call_005.phpt +++ b/tests/classes/__call_005.phpt @@ -1,5 +1,5 @@ --TEST-- -When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. +When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. --FILE-- <?php class A { diff --git a/tests/classes/__call_006.phpt b/tests/classes/__call_006.phpt index c3937393fd0..e6efdefe9e8 100644 --- a/tests/classes/__call_006.phpt +++ b/tests/classes/__call_006.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure exceptions are handled properly when thrown in __call. +Ensure exceptions are handled properly when thrown in __call. --FILE-- <?php class A { diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt index cc7a2773bd8..a1dd4594e9c 100644 --- a/tests/classes/__call_007.phpt +++ b/tests/classes/__call_007.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure exceptions are handled properly when thrown in a statically declared __call. +Ensure exceptions are handled properly when thrown in a statically declared __call. --FILE-- <?php class A { diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index ebe691ca281..63f1ea9801a 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure type hints for unknown types do not trigger autoload. +Ensure type hints for unknown types do not trigger autoload. --FILE-- <?php spl_autoload_register(function ($name) { diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt index 3542866cc04..e893768629d 100644 --- a/tests/classes/constants_basic_004.phpt +++ b/tests/classes/constants_basic_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Test properties with array default values using class constants as keys and values. +Test properties with array default values using class constants as keys and values. --FILE-- <?php class X @@ -21,7 +21,7 @@ Test properties with array default values using class constants as keys and valu class C extends B { - // Static and instance array using class constants with parent + // Static and instance array using class constants with parent public static $sa_c_parent = array(parent::KEY => parent::VALUE); public $a_c_parent = array(parent::KEY => parent::VALUE); diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt index a97be1004a5..55d23f77b11 100644 --- a/tests/classes/constants_basic_005.phpt +++ b/tests/classes/constants_basic_005.phpt @@ -1,5 +1,5 @@ --TEST-- -Test constants with default values based on other constants. +Test constants with default values based on other constants. --FILE-- <?php class C diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt index 1c23d31ca62..8bb1ec05f10 100644 --- a/tests/classes/interface_and_extends.phpt +++ b/tests/classes/interface_and_extends.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 a class cannot extend an interface +ZE2 a class cannot extend an interface --FILE-- <?php diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt index f982a4a64eb..046f3b1c5a7 100644 --- a/tests/classes/interface_constant_inheritance_001.phpt +++ b/tests/classes/interface_constant_inheritance_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure an interface may not shadow an inherited constant. +Ensure an interface may not shadow an inherited constant. --FILE-- <?php interface I1 { diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt index af4ce695f75..952dbaf7f4b 100644 --- a/tests/classes/interface_constant_inheritance_002.phpt +++ b/tests/classes/interface_constant_inheritance_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may not shadow a constant inherited from an interface. +Ensure a class may not shadow a constant inherited from an interface. --FILE-- <?php interface I { diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt index 6b4139bd98b..908ca7b4d68 100644 --- a/tests/classes/interface_constant_inheritance_003.phpt +++ b/tests/classes/interface_constant_inheritance_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may not inherit two constants with the same name from two separate interfaces. +Ensure a class may not inherit two constants with the same name from two separate interfaces. --FILE-- <?php interface I1 { diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt index 7f2d3e514fb..aca9865eb1e 100644 --- a/tests/classes/interface_constant_inheritance_004.phpt +++ b/tests/classes/interface_constant_inheritance_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Ensure a class may implement two interfaces which include the same constant (due to inheritance). +Ensure a class may implement two interfaces which include the same constant (due to inheritance). --FILE-- <?php interface IA { diff --git a/tests/classes/method_override_optional_arg_002.phpt b/tests/classes/method_override_optional_arg_002.phpt index c62e3a562e9..254392718b8 100644 --- a/tests/classes/method_override_optional_arg_002.phpt +++ b/tests/classes/method_override_optional_arg_002.phpt @@ -1,5 +1,5 @@ --TEST-- -Omitting optional arg in method inherited from abstract class +Omitting optional arg in method inherited from abstract class --FILE-- <?php diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index 5ab448e4372..4d8fd9eeb01 100644 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 A private member is +ZE2 A private member is --FILE-- <?php diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt index 2aab44d5864..89c26d3dd39 100644 --- a/tests/classes/static_properties_003.phpt +++ b/tests/classes/static_properties_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt index df297a71b22..68a57a8f89c 100644 --- a/tests/classes/static_properties_003_error1.phpt +++ b/tests/classes/static_properties_003_error1.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt index 45095681608..b428b4ff6ed 100644 --- a/tests/classes/static_properties_003_error2.phpt +++ b/tests/classes/static_properties_003_error2.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt index 4f4288a63c5..b9423639b0a 100644 --- a/tests/classes/static_properties_003_error3.phpt +++ b/tests/classes/static_properties_003_error3.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt index d526e7247b7..6501689ddb5 100644 --- a/tests/classes/static_properties_003_error4.phpt +++ b/tests/classes/static_properties_003_error4.phpt @@ -1,5 +1,5 @@ --TEST-- -Attempting to access static properties using instance property syntax +Attempting to access static properties using instance property syntax --FILE-- <?php class C { diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt index 79bbc6380ba..42860c3301a 100644 --- a/tests/classes/static_properties_004.phpt +++ b/tests/classes/static_properties_004.phpt @@ -1,5 +1,5 @@ --TEST-- -Inherited static properties cannot be separated from their reference set. +Inherited static properties cannot be separated from their reference set. --FILE-- <?php class C { public static $p = 'original'; } diff --git a/tests/classes/this.phpt b/tests/classes/this.phpt index 5551e8ac885..30ea83e2851 100644 --- a/tests/classes/this.phpt +++ b/tests/classes/this.phpt @@ -3,7 +3,7 @@ ZE2 $this cannot be exchanged --FILE-- <?php -/* please don't shorten this test. It shows what would happen if +/* please don't shorten this test. It shows what would happen if * the fatal error would have been a warning. */ class Foo diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt index 8843e50e262..9660530bc76 100644 --- a/tests/lang/022.phpt +++ b/tests/lang/022.phpt @@ -11,7 +11,7 @@ function switchtest ($i, $j) case 0: echo "zero"; break; - case 1: + case 1: echo "one"; break; default: diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt index cfa465deac7..0d040c82d91 100644 --- a/tests/lang/bug20175.phpt +++ b/tests/lang/bug20175.phpt @@ -33,7 +33,7 @@ function foo_static() { /* Part 2: * Storing a reference to the result of a function in a static variable. * Same as Part 1 but: - * The return statement transports a copy of the value to return. In other + * The return statement transports a copy of the value to return. In other * words the return value of bar_global() is a temporary variable only valid * after the function call bar_global() is done in current local scope. */ @@ -83,8 +83,8 @@ function wow_static() { /* Part 4: * Storing a reference to a new instance (that's where the name of the test - * comes from). First there is the global counter $oop_global again which - * counts the calls to the constructor of oop_class and hence counts the + * comes from). First there is the global counter $oop_global again which + * counts the calls to the constructor of oop_class and hence counts the * creation of oop_class instances. * The class oop_test uses a static reference to a oop_class instance. * When another oop_test instance is created it must reuse the statically diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt index 7c4349b71a1..dbf7756daa8 100644 --- a/tests/lang/bug22510.phpt +++ b/tests/lang/bug22510.phpt @@ -4,7 +4,7 @@ Bug #22510 (segfault among complex references) error_reporting=E_ALL | E_DEPRECATED --FILE-- <?php -class foo +class foo { public $list = array(); @@ -29,7 +29,7 @@ class foo } } -class bar +class bar { function run1() { print __CLASS__."::".__FUNCTION__."\n"; diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt index 031045b0837..90bf1d8893a 100644 --- a/tests/lang/bug44827.phpt +++ b/tests/lang/bug44827.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #44827 (Class error when trying to access :: as constant) --CREDITS-- -Sebastian Schürmann +Sebastian Schürmann sebs@php.net Testfest Munich 2009 --FILE-- diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt index cf91803e3fb..e54fb2173e0 100644 --- a/tests/lang/compare_objects_basic1.phpt +++ b/tests/lang/compare_objects_basic1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test standard 'compare' object handler +Test standard 'compare' object handler --FILE-- <?php diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt index 74d74b8cd0e..c38dbcec42a 100644 --- a/tests/lang/compare_objects_basic2.phpt +++ b/tests/lang/compare_objects_basic2.phpt @@ -1,10 +1,10 @@ --TEST-- -Test object compare when object handler different +Test object compare when object handler different --FILE-- <?php -//Set the default time zone +//Set the default time zone date_default_timezone_set("Europe/London"); echo "Simple test comparing two objects with different compare callback handler\n"; diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt index 52019f10c85..dbb0c0aba4d 100644 --- a/tests/lang/engine_assignExecutionOrder_002.phpt +++ b/tests/lang/engine_assignExecutionOrder_002.phpt @@ -38,7 +38,7 @@ $i4 = array(array(1000,2000),3000); $i = array($i1,$i2,$i3,$i4); $j = array(0,0,0); $h = 0; -// a list of lists +// a list of lists list(list($j[$h++],$j[$h++]),$j[$h++]) = $i[3]; var_dump($j); @@ -50,7 +50,7 @@ list(list($l,$m),$n) = $k; echo "L=$l M=$m N=$n\n"; -// expect $x and $y to be null - this fails on php.net 5.2.1 (invalid opcode) - fixed in 5.2.3 +// expect $x and $y to be null - this fails on php.net 5.2.1 (invalid opcode) - fixed in 5.2.3 list($o,$p) = 20; echo "O=$o and P=$p\n"; @@ -65,7 +65,7 @@ list(list(list($r,$s,,$t),list($u,$v),,$w),,$x) = $q4; echo "$r $s $t $u $v $w $x\n"; -// expect y and z to be undefined +// expect y and z to be undefined list($y,$z) = array(); echo "Y=$y,Z=$z\n"; @@ -77,7 +77,7 @@ echo "AA=$aa\n"; list($cc,,$dd) = array(10,20,30,40); echo "CC=$cc DD=$dd\n"; -// expect the inner array to be defined +// expect the inner array to be defined $ee = array("original array"); function f() { global $ee; diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt index d66773f024f..14a2a812b18 100644 --- a/tests/lang/engine_assignExecutionOrder_007.phpt +++ b/tests/lang/engine_assignExecutionOrder_007.phpt @@ -1,5 +1,5 @@ --TEST-- -Check key execution order with new. +Check key execution order with new. --FILE-- <?php $a[2][3] = 'stdClass'; diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt index 504132d0353..e114e839b98 100644 --- a/tests/lang/foreachLoop.010.phpt +++ b/tests/lang/foreachLoop.010.phpt @@ -7,20 +7,20 @@ It will pass only if the 'contentious code' in PHPValue.decReferences() is enabl $a = array(1,2,3); $container = array(&$a); -// From php.net: +// From php.net: // "Unless the array is referenced, foreach operates on a copy of // the specified array and not the array itself." // At this point, the array $a is referenced. // The following line ensures $a is no longer references as a consequence -// of running the 'destructor' on $container. +// of running the 'destructor' on $container. $container = null; // At this point the array $a is no longer referenced, so foreach should operate on a copy of the array. // However, P8 does not invoke 'destructors' when refcount is decremented to 0. // Consequently, $a thinks it is still referenced, and foreach will operate on the array itself. // This provokes a difference in behaviour when changing the number of elements in the array while -// iterating over it. +// iterating over it. $i=0; foreach ($a as $v) { diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt index 8e4fca8a403..1f57e0acdf1 100644 --- a/tests/lang/foreachLoop.011.phpt +++ b/tests/lang/foreachLoop.011.phpt @@ -1,5 +1,5 @@ --TEST-- -Changing from an interable type to a non iterable type during the iteration +Changing from an interable type to a non iterable type during the iteration --FILE-- <?php echo "\nChange from array to non iterable:\n"; diff --git a/tests/lang/foreachLoopIterator.001.phpt b/tests/lang/foreachLoopIterator.001.phpt index 4ca5648e585..61fffc617a5 100644 --- a/tests/lang/foreachLoopIterator.001.phpt +++ b/tests/lang/foreachLoopIterator.001.phpt @@ -1,5 +1,5 @@ --TEST-- -foreach with Iterator. +foreach with Iterator. --FILE-- <?php diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt index 9da14eb6f35..5dd54687216 100644 --- a/tests/lang/func_get_arg.005.phpt +++ b/tests/lang/func_get_arg.005.phpt @@ -1,6 +1,6 @@ --TEST-- A variable, which is referenced by another variable, is passed by value. -During the call, the original variable is updated. This should not affect func_get_arg(). +During the call, the original variable is updated. This should not affect func_get_arg(). --FILE-- <?php function refVal($x) { diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt index d8142c9e7ea..aef61668a47 100644 --- a/tests/lang/func_num_args.004.phpt +++ b/tests/lang/func_num_args.004.phpt @@ -1,5 +1,5 @@ --TEST-- -Pass same variable by ref and by value. +Pass same variable by ref and by value. --FILE-- <?php function valRef($x, &$y) { diff --git a/tests/lang/operators/operator_identical_basic.phpt b/tests/lang/operators/operator_identical_basic.phpt index ad2277ae7ab..cddba995a67 100644 --- a/tests/lang/operators/operator_identical_basic.phpt +++ b/tests/lang/operators/operator_identical_basic.phpt @@ -22,7 +22,7 @@ $invalid_float2 = array("-67345.76567", "-67345.76567aaa", " -67345.76567", "- $toCompare = array( - true, array(true), array_merge($valid_true, $valid_false), + true, array(true), array_merge($valid_true, $valid_false), false, array(false), array_merge($valid_true, $valid_false), $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, diff --git a/tests/lang/operators/operator_lt_or_equal_basic.phpt b/tests/lang/operators/operator_lt_or_equal_basic.phpt index a8b4b43c6bd..5439fd7d750 100644 --- a/tests/lang/operators/operator_lt_or_equal_basic.phpt +++ b/tests/lang/operators/operator_lt_or_equal_basic.phpt @@ -21,7 +21,7 @@ $invalid_float2 = array(-67345.76569, -6.734576569E4); $toCompare = array( true, $valid_true, $valid_false, - false, array_merge($valid_false, $valid_true), NULL, + false, array_merge($valid_false, $valid_true), NULL, $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, $float1, $valid_float1, $invalid_float1, diff --git a/tests/lang/operators/operator_notidentical_basic.phpt b/tests/lang/operators/operator_notidentical_basic.phpt index 9c3db36cdcb..d24c9361194 100644 --- a/tests/lang/operators/operator_notidentical_basic.phpt +++ b/tests/lang/operators/operator_notidentical_basic.phpt @@ -22,7 +22,7 @@ $invalid_float2 = array(-67345.76567, -6.734576567E4); $toCompare = array( - true, array_merge($valid_true, $valid_false), array(true), + true, array_merge($valid_true, $valid_false), array(true), false, array_merge($valid_true, $valid_false), array(false), $int1, $valid_int1, $invalid_int1, $int2, $valid_int2, $invalid_int2, diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt index bbbc564654d..8fe27407f1c 100644 --- a/tests/lang/passByReference_003.phpt +++ b/tests/lang/passByReference_003.phpt @@ -1,5 +1,5 @@ --TEST-- -Implicit initialisation when passing by reference +Implicit initialisation when passing by reference --FILE-- <?php function passbyVal($val) { diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt index c7623fb73a5..4fd9a819a84 100644 --- a/tests/lang/passByReference_008.phpt +++ b/tests/lang/passByReference_008.phpt @@ -1,5 +1,5 @@ --TEST-- -Pass same variable by ref and by value. +Pass same variable by ref and by value. --FILE-- <?php function valRef($x, &$y) { diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt index b1b0c358ee5..7b723d552e9 100644 --- a/tests/lang/passByReference_009.phpt +++ b/tests/lang/passByReference_009.phpt @@ -5,7 +5,7 @@ Assignement as argument function foo(&$x, &$y) { $x = 1; echo $y ; } $x = 0; - foo($x, $x); // prints 1 .. + foo($x, $x); // prints 1 .. function foo2($x, &$y, $z) diff --git a/tests/lang/passByReference_012.phpt b/tests/lang/passByReference_012.phpt index 69d53ca261e..3bc60a484e1 100644 --- a/tests/lang/passByReference_012.phpt +++ b/tests/lang/passByReference_012.phpt @@ -8,7 +8,7 @@ Test pass by reference semantics $stack = array ( array ( 'two' )); var_dump(array_shift(array_shift($stack))); -// This should show the identical warning +// This should show the identical warning $original = array ( array ( 'one' )); $stack = $original; var_dump(array_shift(array_shift($stack))); diff --git a/tests/lang/returnByReference.002.phpt b/tests/lang/returnByReference.002.phpt index 99365f1b144..0880a8b7a55 100644 --- a/tests/lang/returnByReference.002.phpt +++ b/tests/lang/returnByReference.002.phpt @@ -15,12 +15,12 @@ function returnVal() { $a = "original"; $b =& returnVal(); $b = "changed"; -var_dump($a); //expecting warning + "original" +var_dump($a); //expecting warning + "original" $a = "original"; $b =& returnRef(); $b = "changed"; -var_dump($a); //expecting "changed" +var_dump($a); //expecting "changed" ?> --EXPECTF-- diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt index a6d15d7aac2..bd91676b124 100644 --- a/tests/output/ob_clean_basic_001.phpt +++ b/tests/output/ob_clean_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_clean() function : basic functionality +Test ob_clean() function : basic functionality --FILE-- <?php /* Prototype : proto bool ob_clean(void) - * Description: Clean (delete) the current output buffer + * Description: Clean (delete) the current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt index 53f3a53c0c9..fffe4840743 100644 --- a/tests/output/ob_clean_error_001.phpt +++ b/tests/output/ob_clean_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_clean() function : error conditions +Test ob_clean() function : error conditions --FILE-- <?php /* Prototype : proto bool ob_clean(void) - * Description: Clean (delete) the current output buffer + * Description: Clean (delete) the current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt index 5185a2efad7..811d6a0761b 100644 --- a/tests/output/ob_end_flush_basic_001.phpt +++ b/tests/output/ob_end_flush_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_end_flush() function : basic functionality +Test ob_end_flush() function : basic functionality --FILE-- <?php /* Prototype : proto bool ob_end_flush(void) - * Description: Flush (send) the output buffer, and delete current output buffer + * Description: Flush (send) the output buffer, and delete current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt index f1afb4bd3ca..e9c15bd05f2 100644 --- a/tests/output/ob_end_flush_error_001.phpt +++ b/tests/output/ob_end_flush_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_end_flush() function : error conditions +Test ob_end_flush() function : error conditions --FILE-- <?php /* Prototype : proto bool ob_end_flush(void) - * Description: Flush (send) the output buffer, and delete current output buffer + * Description: Flush (send) the output buffer, and delete current output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt index 8e8349369da..e53c7e5a23a 100644 --- a/tests/output/ob_flush_basic_001.phpt +++ b/tests/output/ob_flush_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_flush() function : basic functionality +Test ob_flush() function : basic functionality --FILE-- <?php /* Prototype : proto bool ob_flush(void) - * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer + * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt index 714d01cb70c..6e95810dce3 100644 --- a/tests/output/ob_flush_error_001.phpt +++ b/tests/output/ob_flush_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_flush() function : error conditions +Test ob_flush() function : error conditions --FILE-- <?php /* Prototype : proto bool ob_flush(void) - * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer + * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index 2778c21d69a..3f24ea04f66 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -1,11 +1,11 @@ --TEST-- Test ob_get_contents() function : basic functionality --CREDITS-- -Iain Lewis <ilewis@php.net> +Iain Lewis <ilewis@php.net> --FILE-- <?php /* Prototype : proto string ob_get_contents(void) - * Description: Return the contents of the output buffer + * Description: Return the contents of the output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_get_contents_error_001.phpt b/tests/output/ob_get_contents_error_001.phpt index 00ccf30bef3..2c1c043ba75 100644 --- a/tests/output/ob_get_contents_error_001.phpt +++ b/tests/output/ob_get_contents_error_001.phpt @@ -1,11 +1,11 @@ --TEST-- Test ob_get_contents() function : error cases --CREDITS-- -Iain Lewis <ilewis@php.net> +Iain Lewis <ilewis@php.net> --FILE-- <?php /* Prototype : proto string ob_get_contents(void) - * Description: Return the contents of the output buffer + * Description: Return the contents of the output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt index fe8df5a17ab..4a6c84785bb 100644 --- a/tests/output/ob_get_level_basic_001.phpt +++ b/tests/output/ob_get_level_basic_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_get_level() function : basic functionality +Test ob_get_level() function : basic functionality --FILE-- <?php /* Prototype : proto int ob_get_level(void) - * Description: Return the nesting level of the output buffer + * Description: Return the nesting level of the output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt index ede78fc17be..00e9eca5557 100644 --- a/tests/output/ob_get_level_error_001.phpt +++ b/tests/output/ob_get_level_error_001.phpt @@ -1,9 +1,9 @@ --TEST-- -Test ob_get_level() function : error conditions +Test ob_get_level() function : error conditions --FILE-- <?php /* Prototype : proto int ob_get_level(void) - * Description: Return the nesting level of the output buffer + * Description: Return the nesting level of the output buffer * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt index b980dda9178..780eb6dfbba 100644 --- a/tests/output/ob_implicit_flush_basic_001.phpt +++ b/tests/output/ob_implicit_flush_basic_001.phpt @@ -3,7 +3,7 @@ Test ob_implicit_flush() function : check return value (always null). --FILE-- <?php /* Prototype : proto void ob_implicit_flush([int flag]) - * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call + * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt index 1f895d10377..37d10ba6402 100644 --- a/tests/output/ob_implicit_flush_basic_002.phpt +++ b/tests/output/ob_implicit_flush_basic_002.phpt @@ -3,7 +3,7 @@ Test ob_implicit_flush() function : ensure implicit flushing does not apply to u --FILE-- <?php /* Prototype : proto void ob_implicit_flush([int flag]) - * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call + * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_implicit_flush_error_001.phpt b/tests/output/ob_implicit_flush_error_001.phpt index c70304aeccc..63c892e0c48 100644 --- a/tests/output/ob_implicit_flush_error_001.phpt +++ b/tests/output/ob_implicit_flush_error_001.phpt @@ -3,7 +3,7 @@ Test ob_implicit_flush() function : wrong number of arguments --FILE-- <?php /* Prototype : proto void ob_implicit_flush([int flag]) - * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call + * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt index 0e8ce5313d5..d6d3a45e016 100644 --- a/tests/output/ob_implicit_flush_variation_001.phpt +++ b/tests/output/ob_implicit_flush_variation_001.phpt @@ -1,11 +1,11 @@ --TEST-- -Test ob_implicit_flush() function : usage variation +Test ob_implicit_flush() function : usage variation --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); --FILE-- <?php /* Prototype : void ob_implicit_flush([int flag]) - * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call + * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call * Source code: main/output.c * Alias to functions: */ diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index 11ced5779da..eff12042361 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -1,5 +1,5 @@ --TEST-- -ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size. +ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size. --INI-- opcache.optimization_level=0 --FILE-- diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt index ef644a4fb15..a95281fc137 100644 --- a/tests/run-test/test005.phpt +++ b/tests/run-test/test005.phpt @@ -12,7 +12,7 @@ track_errors=1 // // We check the general ini settings which affect error handling // and than verify if a message is given by a division by zero. -// EXPECTF is used here since the error format may change but ut +// EXPECTF is used here since the error format may change but ut // should always contain 'Division by zero'. var_dump(ini_get('display_errors')); var_dump(ini_get('error_reporting')); diff --git a/tests/run-test/test008.phpt b/tests/run-test/test008.phpt index 41d22d8e718..c289e7a6968 100644 --- a/tests/run-test/test008.phpt +++ b/tests/run-test/test008.phpt @@ -12,7 +12,7 @@ track_errors=1 // // We check the general ini settings which affect error handling // and than verify if a message is given by a division by zero. -// EXPECTF is used here since the error format may change but ut +// EXPECTF is used here since the error format may change but ut // should always contain 'Division by zero'. var_dump(ini_get('display_errors')); var_dump(ini_get('error_reporting')); diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt index 9814fa12f78..d247eb36c28 100644 --- a/tests/run-test/test008a.phpt +++ b/tests/run-test/test008a.phpt @@ -12,7 +12,7 @@ track_errors=1 // // We check the general ini settings which affect error handling // and than verify if a message is given by a division by zero. -// EXPECTF is used here since the error format may change but ut +// EXPECTF is used here since the error format may change but ut // should always contain 'Division by zero'. var_dump(ini_get('display_errors')); var_dump(ini_get('error_reporting')); diff --git a/tests/strings/002.phpt b/tests/strings/002.phpt index 7b95a256450..5e820910884 100644 --- a/tests/strings/002.phpt +++ b/tests/strings/002.phpt @@ -1,7 +1,7 @@ --TEST-- Formatted print functions --FILE-- -<?php +<?php error_reporting(0); $fp = fopen("php://stdout", "w") or die("Arrggsgg!!"); diff --git a/tests/strings/bug22592.phpt b/tests/strings/bug22592.phpt index 3443c328593..c66e27d880c 100644 --- a/tests/strings/bug22592.phpt +++ b/tests/strings/bug22592.phpt @@ -13,7 +13,7 @@ $correct[1] = '*'; $correct[3] = '*'; $correct[5] = '*'; -// This produces the +// This produces the $wrong[1] = $wrong[3] = $wrong[5] = '*'; var_dump($correct);