More general functions test fixes

Author: nikic

ext/standard/tests/general_functions/bug41970.phpt

@@ -21,11 +21,11 @@ try {
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5
+Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line %d
 bool(true)
 strlen() expects parameter 1 to be string, array given
 
-Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7
+Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line %d
 bool(true)
 strlen() expects parameter 1 to be string, array given
 Done

ext/standard/tests/general_functions/error_get_last.phpt

@@ -19,6 +19,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 NULL
+error_get_last() expects exactly 0 parameters, 1 given
 NULL
 
 Notice: Undefined variable: b in %s on line %d
@@ -30,6 +31,6 @@ array(4) {
   ["file"]=>
   string(%i) "%s"
   ["line"]=>
-  int(7)
+  int(11)
 }
 Done

ext/standard/tests/general_functions/get_include_path_basic.phpt

@@ -25,5 +25,4 @@ if (ini_get("include_path") == get_include_path()) {
 *** Testing get_include_path()
 string(1) "."
 PASSED
-
 ===DONE===

ext/standard/tests/general_functions/get_included_files.phpt

@@ -52,5 +52,4 @@ array(4) {
   [3]=>
   string(%d) "%sget_included_files_inc3.inc"
 }
-
 ===DONE===

ext/standard/tests/general_functions/include_path.phpt

@@ -35,7 +35,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 string(1) "."
-string(1) "."
+NULL
 string(1) "."
 string(3) "var"
 NULL

ext/standard/tests/general_functions/parse_ini_file.phpt

@@ -119,22 +119,22 @@ var_dump(parse_ini_file($filename, true));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line 8
+Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
 bool(false)
 
-Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line 9
+Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line %d
 bool(false)
 array(1) {
   ["test"]=>
   string(0) ""
 }
 
 Warning: syntax error, unexpected '='%sparse_ini_file.dat on line 2
- in %sparse_ini_file.php on line 20
+ in %sparse_ini_file.php on line %d
 bool(false)
 
 Warning: syntax error, unexpected '='%sparse_ini_file.dat on line 2
- in %sparse_ini_file.php on line 26
+ in %sparse_ini_file.php on line %d
 bool(false)
 array(1) {
   ["test"]=>

ext/standard/tests/general_functions/php_uname_error.phpt

@@ -19,5 +19,4 @@ var_dump( php_uname('z') == php_uname('z') );
 
 -- Testing php_uname() function with invalid mode --
 bool(true)
-
 ===DONE===

ext/standard/tests/general_functions/print_r.phpt

@@ -1696,5 +1696,4 @@ Array
 -- Iteration 4 --
 
 
-
 Done

ext/standard/tests/general_functions/print_r_64bit.phpt

@@ -1700,5 +1700,4 @@ Array
 -- Iteration 4 --
 
 
-
 Done

ext/standard/tests/general_functions/var_dump.phpt

@@ -1549,5 +1549,4 @@ array(6) {
     string(5) "/00\7"
   }
 }
-
 Done