diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 3eb085b10ac04..bab02dd565d50 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -2,16 +2,6 @@ Test unset(), empty() and isset() functions --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- =') or die("skip requires onigu ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- 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 - mixed reset ( array &$array ) -> Reset the internal pointer to first element -*/ $basic_arrays = array ( array(0), // array with element as 0 diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 115a7096d80e5..92c4564019f05 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -2,12 +2,6 @@ Test array_change_key_case() function --FILE-- 1, 'red' => 2, 'green' => 3, 'purple' => 4); diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt index 80ff5728fe47a..a468b832b6870 100644 --- a/ext/standard/tests/array/array_diff_key_error.phpt +++ b/ext/standard/tests/array/array_diff_key_error.phpt @@ -2,11 +2,6 @@ Test array_diff_key() function : error conditions --FILE-- 4, 'null' => NULL); -// callback function without parameters and with return value function callback1() { return 1; @@ -35,8 +29,6 @@ function callback2($input) echo "-- Callback function with parameter and without return --\n"; var_dump( array_filter($input, "callback2") ); - -// callback function without parameter and without return value function callback3() { } diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index 81d9929c15493..1d7735a3f15e9 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -2,17 +2,11 @@ Test array_filter() function : usage variations - 'input' argument with different false entries --FILE-- 5 then - * returns true else returns false - */ function callback($input) { if($input > 5) { diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 2ecda7a5d8926..d2a6255160f96 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -2,11 +2,6 @@ Test array_filter() function : usage variations - anonymous callback functions --FILE-- value flipped - * Source code: ext/standard/array.c -*/ - echo "*** Testing array_flip() : basic functionality ***\n"; // array with default keys - numeric values diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt index 8d86210f0f6d5..8bf704627e760 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 1f6fb5804cde3..3c8f41cc3b85b 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 0ad2367701adf..d6ada3e6c2057 100644 --- a/ext/standard/tests/array/array_flip_variation4.phpt +++ b/ext/standard/tests/array/array_flip_variation4.phpt @@ -2,11 +2,6 @@ Test array_flip() function : usage variations - 'input' argument with different invalid values for keys --FILE-- value flipped - * Source code: ext/standard/array.c -*/ - /* * Trying different invalid values for 'input' array argument */ diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index 3ba0cf1aa410e..49be7de9033f6 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -2,11 +2,6 @@ Test array_flip() function : usage variations - 'input' argument with repeatitive keys and values --FILE-- value flipped - * Source code: ext/standard/array.c -*/ - /* * Using different types of repeatitive keys as well as values for 'input' array */ diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index 17e48b4ba0602..d20cef75a3ef7 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -2,12 +2,6 @@ Test array_intersect_assoc() function : basic functionality --FILE-- 1, 'red' => 2, 'green' => 3, 'purple' => 4); diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt index 70cb53412de4b..49df346972717 100644 --- a/ext/standard/tests/array/array_intersect_key_error.phpt +++ b/ext/standard/tests/array/array_intersect_key_error.phpt @@ -2,11 +2,6 @@ Test array_intersect_key() function : error conditions --FILE-- "value"); diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt index f56f69ac76473..b0c3745b3648b 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -2,11 +2,6 @@ Test array_map() function : usage variations - anonymous callback function --FILE-- "v1","k2"=>"v2"); $arr[]=&$arr["k1"]; diff --git a/ext/standard/tests/array/array_map_variation3.phpt b/ext/standard/tests/array/array_map_variation3.phpt index c37925c05e52c..e252c5a7c5a5f 100644 --- a/ext/standard/tests/array/array_map_variation3.phpt +++ b/ext/standard/tests/array/array_map_variation3.phpt @@ -2,11 +2,6 @@ Test array_map() function : usage variations - different arrays for 'arr1' argument --FILE-- "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 - * key - key in key/value pair - * prefix - string to be added - * Description : alters the array values by appending prefix string - */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -29,11 +17,6 @@ function test_alter(&$item, $key, $prefix) echo "\n"; // new line to separate the output between each element } -/* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair - * key - key in key/value pair - * Description : prints the array values with keys - */ function test_print($item, $key) { // dump the arguments to check that they are passed diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt index e5aeadcdc09c0..d3209d87c2327 100644 --- a/ext/standard/tests/array/array_walk_error2.phpt +++ b/ext/standard/tests/array/array_walk_error2.phpt @@ -2,11 +2,6 @@ Test array_walk() function : error conditions - callback parameters --FILE-- "lemon", "b" => array( "c" => "orange", "d" => "banana"), "e" => array("f" => "apple")); -// User defined callback functions -/* Prototype : test_alter(mixed $item, mixed $key, string $prefix) - * Parameters : item - value in key/value pair - * key - key in key/value pair - * prefix - string to be added - * Description : alters the array values by appending prefix string - */ function test_alter(&$item, $key, $prefix) { // dump the arguments to check that they are passed @@ -29,11 +17,6 @@ function test_alter(&$item, $key, $prefix) echo "\n"; // new line to separate the output between each element } -/* Prototype : test_print(mixed $item, mixed $key) - * Parameters : item - value in key/value pair - * key - key in key/value pair - * Description : prints the array values with keys - */ function test_print($item, $key) { // dump the arguments to check that they are passed diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt index 2509c95f60dcd..ad4fd99ede623 100644 --- a/ext/standard/tests/array/array_walk_recursive_error2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt @@ -2,11 +2,6 @@ Test array_walk_recursive() function : error conditions - callback parameters --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- "; print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n"; diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt index 63b3c1db67ee3..407f51a4d160d 100644 --- a/ext/standard/tests/file/005_variation2-win32.phpt +++ b/ext/standard/tests/file/005_variation2-win32.phpt @@ -10,28 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- "; diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt index f365174a84542..5a878a687b9c6 100644 --- a/ext/standard/tests/file/005_variation2.phpt +++ b/ext/standard/tests/file/005_variation2.phpt @@ -10,28 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- "; diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 43c9b86ab0363..17092ce02ee93 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -9,14 +9,6 @@ require __DIR__ . '/../skipif_root.inc'; ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- obscure_filename --FILE-- --FILE-- --FILE-- obscure_filename --FILE-- --FILE-- obscure_filename --FILE-- --FILE-- obscure_filename --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index 0abd264621b0f..dbc74966ee626 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -13,12 +13,6 @@ if (!file_exists("/dev/ram0")) { ?> --FILE-- diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index 812c2958a5ed8..df1199d468c51 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -3,7 +3,6 @@ Test flock() function: Basic functionality --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- obscure_filename --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- 0.0, diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt index e688253e3f64c..2f184a53e7aee 100644 --- a/ext/standard/tests/general_functions/floatval_variation1.phpt +++ b/ext/standard/tests/general_functions/floatval_variation1.phpt @@ -2,12 +2,6 @@ Testing floatval() and its alias doubleval() functions : usage variations - different data types as $y arg --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- ] diff --git a/ext/standard/tests/general_functions/php_uname_basic.phpt b/ext/standard/tests/general_functions/php_uname_basic.phpt index b4fb78e6ea8fa..11af4d03c5f06 100644 --- a/ext/standard/tests/general_functions/php_uname_basic.phpt +++ b/ext/standard/tests/general_functions/php_uname_basic.phpt @@ -2,9 +2,6 @@ Test php_uname() function - basic test --FILE-- --FILE-- --FILE-- 4) { --FILE-- --FILE-- 4) { ?> --FILE-- p = '22'; diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt index 83dd2aa297c08..1c1d04dcb9dd5 100644 --- a/ext/standard/tests/general_functions/var_export_error2.phpt +++ b/ext/standard/tests/general_functions/var_export_error2.phpt @@ -2,16 +2,10 @@ Test var_export() function : error conditions - recursive object --FILE-- p =& $obj; var_export($obj, true); ?> --EXPECTF-- -Warning: var_export does not handle circular references in %s on line 10 +Warning: var_export does not handle circular references in %s on line %d diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt index 7c2bc54ef3609..6c953e9821dbe 100644 --- a/ext/standard/tests/general_functions/var_export_error3.phpt +++ b/ext/standard/tests/general_functions/var_export_error3.phpt @@ -2,15 +2,9 @@ Test var_export() function : error conditions - recursive array --FILE-- --EXPECTF-- -Warning: var_export does not handle circular references in %s on line 9 +Warning: var_export does not handle circular references in %s on line %d diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index ad857243d7f4a..f1a6d108d31bd 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -2,11 +2,6 @@ Test getimagesize() function : basic functionality --FILE-- "200x100.gif", diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index b4c6413a08a68..5577d94060272 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -2,12 +2,6 @@ Test getimagesize() function : basic functionality - load APP info from jpeg. --FILE-- "test.txt", diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index d2e2c8455463e..fac3900417b8f 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -8,11 +8,6 @@ Test getimagesize() function : variation - For shockwave-flash format ?> --FILE-- --FILE-- --FILE-- --FILE-- /tmp/php_test_mailBasic2.out" mail.add_x_header = Off --FILE-- --FILE-- --FILE-- abc) contains invalid chars or format in %s on line 112 +Warning: mail(): Header field value (foo10 => abc) contains invalid chars or format in %s on line %d bool(true) To: user@example.com Subject: Test Subject diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt index 5952a14f59ab1..0cffdfd2aa21e 100644 --- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt +++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt @@ -13,12 +13,6 @@ require_once(__DIR__.'/mail_skipif.inc'); max_execution_time = 120 --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt index 56c74bb37eb0a..bbcd4ea876cfa 100644 --- a/ext/standard/tests/network/ip2long_variation2.phpt +++ b/ext/standard/tests/network/ip2long_variation2.phpt @@ -5,12 +5,6 @@ Test ip2long() function : usage variation 2, 32 bit --FILE-- --FILE-- p); diff --git a/ext/standard/tests/serialize/serialization_objects_007.phpt b/ext/standard/tests/serialize/serialization_objects_007.phpt index 5082b7ff0128c..a971db16be473 100644 --- a/ext/standard/tests/serialize/serialization_objects_007.phpt +++ b/ext/standard/tests/serialize/serialization_objects_007.phpt @@ -2,17 +2,6 @@ Ensure __autoload is called twice if unserialize_callback_func is defined. --FILE-- string(3) "FOO" diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt index 675911f3e1dd2..3670ddde5bbc2 100644 --- a/ext/standard/tests/serialize/serialization_objects_008.phpt +++ b/ext/standard/tests/serialize/serialization_objects_008.phpt @@ -2,24 +2,13 @@ Bad unserialize_callback_func --FILE-- --EXPECTF-- -Warning: unserialize(): defined (Nonexistent) but not found in %s on line 14 +Warning: unserialize(): defined (Nonexistent) but not found in %s on line %d object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(3) "FOO" diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt index 74acc16ced60b..9485f3ef80683 100644 --- a/ext/standard/tests/serialize/serialization_objects_009.phpt +++ b/ext/standard/tests/serialize/serialization_objects_009.phpt @@ -2,17 +2,6 @@ Custom unserialization of classes with no custom unserializer. --FILE-- --EXPECT-- diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index fa731302414a0..1aa9266fc17e0 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -4,17 +4,6 @@ Test serialize_precision (part 2) serialize_precision=75 --FILE-- --EXPECT-- diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt index 1ec975e3f91e6..64925d4eb4bf0 100644 --- a/ext/standard/tests/serialize/serialization_resources_001.phpt +++ b/ext/standard/tests/serialize/serialization_resources_001.phpt @@ -2,17 +2,6 @@ Test serialize() & unserialize() functions: resources --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt index 83892a381ae39..4f4920c7ac08a 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt @@ -2,11 +2,6 @@ Test get_html_translation_table() function : basic functionality - with default args --FILE-- \"&\n"; diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index c43d385563fb2..d3e3166fb95b4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -2,11 +2,6 @@ Test htmlspecialchars_decode() function : basic functionality --FILE-- --FILE-- --FILE-- 13, diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index c9b03141bfd59..d3d11a705d40c 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -4,11 +4,6 @@ Test http_build_query() function: usage variations - testing four parameter adde Adam Gegotek --FILE-- "main page", "sort" => "desc,admin", diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt index 64c31048c8d7f..bd0e03c6d565a 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 0429fe0b49d7f..8e8c554ee9e11 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -2,12 +2,6 @@ Test join() function : basic functionality --FILE-- diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt index 0e2db58e9502f..a7920648e40f0 100644 --- a/ext/standard/tests/strings/md5_basic2.phpt +++ b/ext/standard/tests/strings/md5_basic2.phpt @@ -2,11 +2,6 @@ Test md5() function : basic functionality - with raw output --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- precision=14 --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- "T", "e" => "E", "st" => "ST"); diff --git a/ext/standard/tests/strings/strtr_variation1.phpt b/ext/standard/tests/strings/strtr_variation1.phpt index 44326ad4aa7f9..f52e14b6eb698 100644 --- a/ext/standard/tests/strings/strtr_variation1.phpt +++ b/ext/standard/tests/strings/strtr_variation1.phpt @@ -2,12 +2,6 @@ Test strtr() function : usage variations - regular & numeric strings for 'str' argument --FILE-- precision=14 --FILE-- --FILE-- --FILE-- precision=14 --FILE-- precision=14 --FILE-- precision=14 --FILE-- precision=14 --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- simple notesimple note"; diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt index 48d91eafb6a7c..7d398dfd7014e 100644 --- a/ext/xml/tests/xml_parser_set_option_basic.phpt +++ b/ext/xml/tests/xml_parser_set_option_basic.phpt @@ -8,12 +8,6 @@ if (!extension_loaded("xml")) { ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt index 66231a3f989db..3a8ee949bc4a7 100644 --- a/ext/zlib/tests/gzcompress_basic1.phpt +++ b/ext/zlib/tests/gzcompress_basic1.phpt @@ -8,12 +8,6 @@ if (!extension_loaded("zlib")) { ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --EXPECTF-- -Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line 7 +Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line %d bool(false) bool(true) bool(true) -Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line 16 +Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line %d bool(false) diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt index 00e70b3b9262f..1a2e7f63a3b8b 100644 --- a/tests/output/ob_end_flush_basic_001.phpt +++ b/tests/output/ob_end_flush_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_end_flush() function : basic functionality --FILE-- --FILE-- --EXPECTF-- - ---> Test arrays: +---> Test arrays: -Warning: ob_start(): array must have exactly two members in %s on line 44 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 44 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): class 'f' not found in %s on line 47 +Warning: ob_start(): class 'f' not found in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 47 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 50 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 50 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 53 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 53 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 56 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 56 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( @@ -126,9 +125,9 @@ Array ) -Warning: ob_start(): array must have exactly two members in %s on line 68 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 68 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt index 36efb124a75d4..98c348fe4a580 100644 --- a/tests/output/ob_start_error_001.phpt +++ b/tests/output/ob_start_error_001.phpt @@ -3,7 +3,6 @@ Test wrong number of arguments and wrong arg types for ob_start() --FILE-- --EXPECTF-- -Warning: ob_start(): class 'nonExistent' not found in %s on line 13 +Warning: ob_start(): class 'nonExistent' not found in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 13 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) -Warning: ob_start(): class 'C' does not have a method 'nonExistent' in %s on line 14 +Warning: ob_start(): class 'C' does not have a method 'nonExistent' in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 14 +Notice: ob_start(): Failed to create buffer in %s on line 13 bool(false) -Warning: ob_start(): class 'C' does not have a method 'no' in %s on line 15 +Warning: ob_start(): class 'C' does not have a method 'no' in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 15 +Notice: ob_start(): Failed to create buffer in %s on line 14 bool(false) -Warning: ob_start(): function 'no' not found or invalid function name in %s on line 16 +Warning: ob_start(): function 'no' not found or invalid function name in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 16 +Notice: ob_start(): Failed to create buffer in %s on line 15 bool(false) done diff --git a/tests/output/ob_start_error_003.phpt b/tests/output/ob_start_error_003.phpt index 30b030daf72f2..70e86e3728d5f 100644 --- a/tests/output/ob_start_error_003.phpt +++ b/tests/output/ob_start_error_003.phpt @@ -3,7 +3,6 @@ Test ob_start() with object supplied but no method. --FILE-- --EXPECTF-- -Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %s on line 9 +Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %s on line %d