More string test fixes

Author: nikic

ext/standard/tests/strings/convert_cyr_string.phpt

@@ -4,7 +4,6 @@ basic convert_cyr_string() tests
 <?php
 
 var_dump(convert_cyr_string("", "", ""));
-var_dump(convert_cyr_string(array(), array(), array()));
 
 var_dump(convert_cyr_string("[[[[[[", "q", "m"));
 var_dump(convert_cyr_string("[[[[[[", "k", "w"));
@@ -22,9 +21,6 @@ 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(0) ""
 
-Warning: convert_cyr_string() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
 Warning: convert_cyr_string(): Unknown source charset: q in %s on line %d
 string(6) "[[[[[["
 string(6) "[[[[[["

ext/standard/tests/strings/explode1.phpt

@@ -493,5 +493,4 @@ array(2) {
   [1]=>
   string(4) "ject"
 }
-
 Done

ext/standard/tests/strings/lcfirst.phpt

@@ -65,7 +65,6 @@ echo ($n==0)?"all passed\n":"$n failed\n";
 
 var_dump(levenshtein("", "", -1, -1, -1));
 var_dump(levenshtein("", "", 10, 10, 10));
-var_dump(levenshtein(""));
 
 ?>
 --EXPECTF--
@@ -77,6 +76,3 @@ Warning: levenshtein(): Argument string(s) too long in %s on line %d
 all passed
 int(0)
 int(0)
-
-Warning: Wrong parameter count for levenshtein() in %s on line %d
-NULL

ext/standard/tests/strings/levenshtein.phpt

@@ -11,7 +11,11 @@ echo "*** Testing printf() : error conditions ***\n";
 
 // Zero arguments
 echo "\n-- Testing printf() function with Zero arguments --\n";
-var_dump( printf() );
+try {
+    var_dump( printf() );
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "\n-- Testing printf() function with less than expected no. of arguments --\n";
 $format1 = '%s';
@@ -38,9 +42,7 @@ var_dump( printf($format3) );
 *** Testing printf() : error conditions ***
 
 -- Testing printf() function with Zero arguments --
-
-Warning: printf() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
+printf() expects at least 1 parameter, 0 given
 
 -- Testing printf() function with less than expected no. of arguments --
 

ext/standard/tests/strings/printf_error.phpt

@@ -12,10 +12,9 @@ var_dump(quoted_printable_encode(false));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 string(0) ""
 string(4) "test"
-
 string(1) "1"
 string(0) ""
 string(0) ""