general functions test fixes

Author: nikic

ext/standard/tests/strings/addcslashes_001.phpt

@@ -2,9 +2,11 @@
 Bug #54322: Null pointer deref in get_html_translation_table due to information loss in long-to-int conversion
 --FILE--
 <?php
-var_dump(
-get_html_translation_table(NAN, 0, "UTF-8") > 0
-);
---EXPECTF--
-Warning: get_html_translation_table() expects parameter 1 to be int, float given in %s on line %d
-bool(false)
+try {
+    var_dump(get_html_translation_table(NAN, 0, "UTF-8") > 0);
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+get_html_translation_table() expects parameter 1 to be int, float given

ext/standard/tests/strings/bug54322.phpt

@@ -11,24 +11,28 @@ Test chr() function : error conditions
 echo "*** Testing chr() : error conditions ***\n";
 
 echo "\n-- Testing chr() function with no arguments --\n";
-var_dump( chr() );
+try {
+    var_dump( chr() );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "\n-- Testing chr() function with more than expected no. of arguments --\n";
 $extra_arg = 10;
-var_dump( chr(72, $extra_arg) );
+try {
+    var_dump( chr(72, $extra_arg) );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing chr() : error conditions ***
 
 -- Testing chr() function with no arguments --
-
-Warning: Wrong parameter count for chr() in %s on line %d
-NULL
+Wrong parameter count for chr()
 
 -- Testing chr() function with more than expected no. of arguments --
-
-Warning: Wrong parameter count for chr() in %s on line %d
-NULL
+Wrong parameter count for chr()
 ===DONE===

ext/standard/tests/strings/chr_error.phpt

@@ -46,7 +46,11 @@ $values = array (
 // loop through each element of values for 'chunklen'
 for($count = 0; $count < count($values); $count++) {
   echo "-- Iteration ".($count+1). " --\n";
-  var_dump( chunk_split($heredoc_str, $values[$count], $ending) );
+  try {
+    var_dump( chunk_split($heredoc_str, $values[$count], $ending) );
+  } catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+  }
 }
 
 echo "Done"
@@ -82,9 +86,7 @@ string(129) "This's heredoc string with 	 and
 It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test
 chunk_split():::"
 -- Iteration 7 --
-
-Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d
-NULL
+chunk_split() expects parameter 2 to be int, float given
 -- Iteration 8 --
 
 Warning: chunk_split(): Chunk length should be greater than zero in %s on line %d

ext/standard/tests/strings/chr_ord.phpt

@@ -3,9 +3,6 @@ basic convert_cyr_string() tests
 --FILE--
 <?php
 
-var_dump(convert_cyr_string());
-var_dump(convert_cyr_string(""));
-var_dump(convert_cyr_string("", ""));
 var_dump(convert_cyr_string("", "", ""));
 var_dump(convert_cyr_string(array(), array(), array()));
 
@@ -20,15 +17,6 @@ var_dump(convert_cyr_string("", "d", "i"));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: convert_cyr_string() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: convert_cyr_string() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
 Warning: convert_cyr_string(): Unknown source charset:  in %s on line %d
 
 Warning: convert_cyr_string(): Unknown destination charset:  in %s on line %d

ext/standard/tests/strings/chunk_split_variation5.phpt

@@ -15,15 +15,6 @@ $extra_arg = 10;
 
 echo "*** Testing convert_cyr_string() : error conditions ***\n";
 
-echo "\n-- Testing convert_cyr_string() function with no arguments --\n";
-var_dump( convert_cyr_string() );
-
-echo "\n-- Testing convert_cyr_string() function with no 'to' character set --\n";
-var_dump( convert_cyr_string($str, $from) );
-
-echo "\n-- Testing convert_cyr_string() function with more than expected no. of arguments --\n";
-var_dump( convert_cyr_string($str, $from, $to, $extra_arg) );
-
 echo "\n-- Testing convert_cyr_string() function with invalid 'from' character set --\n";
 var_dump(bin2hex( convert_cyr_string($str, "?", $to) ));
 
@@ -38,21 +29,6 @@ var_dump(bin2hex( convert_cyr_string($str, ">", "?")) );
 --EXPECTF--
 *** Testing convert_cyr_string() : error conditions ***
 
--- Testing convert_cyr_string() function with no arguments --
-
-Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
--- Testing convert_cyr_string() function with no 'to' character set --
-
-Warning: convert_cyr_string() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
--- Testing convert_cyr_string() function with more than expected no. of arguments --
-
-Warning: convert_cyr_string() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
-
 -- Testing convert_cyr_string() function with invalid 'from' character set --
 
 Warning: convert_cyr_string(): Unknown source charset: ? in %s on line %d

ext/standard/tests/strings/chunk_split_variation8.phpt

@@ -19,8 +19,6 @@ echo (CRYPT_MD5)      ? ((crypt($str, $salt3) === $res_3) ? 'MD5' : 'MD5 - ERROR
 echo (CRYPT_BLOWFISH) ? ((crypt($str, $salt4) === $res_4) ? 'BLO' : 'BLO - ERROR') : 'BLO', "\n";
 
 var_dump(crypt($str));
-var_dump(crypt());
-var_dump(crypt("", "", ""));
 
 ?>
 --EXPECTF--
@@ -31,9 +29,3 @@ BLO
 
 Notice: crypt(): No salt parameter was specified. You must use a randomly generated salt and a strong hash function to produce a secure hash. in %s on line %d
 string(%d) "%s"
-
-Warning: crypt() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: crypt() expects at most 2 parameters, 3 given in %s on line %d
-NULL

ext/standard/tests/strings/convert_cyr_string.phpt

@@ -6,26 +6,15 @@ Test dirname() function : error conditions
    Description: Returns directory name component of path.
 */
 echo "*** Testing error conditions ***\n";
-// zero arguments
-var_dump( dirname() );
 
 // Bad arg
 var_dump( dirname("/var/tmp/bar.gz", 0) );
 
-// more than expected no. of arguments
-var_dump( dirname("/var/tmp/bar.gz", 1, ".gz") );
-
 echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing error conditions ***
 
-Warning: dirname() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: dirname(): Invalid argument, levels must be >= 1 in %s on line %d
 NULL
-
-Warning: dirname() expects at most 2 parameters, 3 given in %s on line %d
-NULL
 Done