bz2 test fixes

Author: nikic

ext/bz2/tests/001.phpt

@@ -5,7 +5,6 @@ bzopen() and invalid parameters
 --FILE--
 <?php
 
-var_dump(bzopen());
 var_dump(bzopen("", ""));
 var_dump(bzopen("", "r"));
 var_dump(bzopen("", "w"));
@@ -19,9 +18,6 @@ var_dump(bzopen($fp, "r"));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
 Warning: bzopen(): '' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. in %s on line %d
 bool(false)
 

ext/bz2/tests/003-mb.phpt

@@ -6,8 +6,6 @@ bzread() tests
 <?php
 
 $fd = bzopen(dirname(__FILE__)."/003私はガラスを食べられます.txt.bz2","r");
-var_dump(bzread());
-var_dump(bzread($fd, 1 ,0));
 var_dump(bzread($fd, 0));
 var_dump(bzread($fd, -10));
 var_dump(bzread($fd, 1));
@@ -17,11 +15,6 @@ var_dump(bzread($fd, 100000));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
-Warning: bzread() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
 string(0) ""
 
 Warning: bzread(): length may not be negative in %s on line %d

ext/bz2/tests/003.phpt

@@ -6,8 +6,6 @@ bzread() tests
 <?php
 
 $fd = bzopen(dirname(__FILE__)."/003.txt.bz2","r");
-var_dump(bzread());
-var_dump(bzread($fd, 1 ,0));
 var_dump(bzread($fd, 0));
 var_dump(bzread($fd, -10));
 var_dump(bzread($fd, 1));
@@ -17,11 +15,6 @@ var_dump(bzread($fd, 100000));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
-Warning: bzread() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
 string(0) ""
 
 Warning: bzread(): length may not be negative in %s on line %d

ext/bz2/tests/005.phpt

@@ -10,7 +10,6 @@ Drifting further everyday
 Getting lost within myself
 Nothing matters no one else";
 
-var_dump(bzcompress());
 var_dump(bzcompress(1,1,1));
 var_dump(bzcompress($string, 100));
 var_dump(bzcompress($string, 100, -1));
@@ -23,8 +22,6 @@ $data2 = bzcompress($string, 1, 10);
 $data3 = $data2;
 $data3{3} = 0;
 
-var_dump(bzdecompress());
-var_dump(bzdecompress(1,1,1));
 var_dump(bzdecompress(1,1));
 var_dump(bzdecompress($data3));
 var_dump(bzdecompress($data3,1));
@@ -38,19 +35,11 @@ var_dump(bzdecompress($data2));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: bzcompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
 string(%d) "BZ%a"
 int(-2)
 int(-2)
 int(-2)
 int(-2)
-
-Warning: bzdecompress() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
-Warning: bzdecompress() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
 int(-5)
 int(-5)
 int(-5)

ext/standard/tests/array/005.phpt

@@ -71,7 +71,6 @@ echo"Done";
 ?>
 --EXPECTF--
 *** Testing Error Conditions ***
-
 NULL
 
 *** Testing with various array inputs ***

ext/standard/tests/array/009.phpt

@@ -410,3 +410,5 @@ array(5) {
   [0]=>
   string(4) "zero"
 }
+
+Done

ext/standard/tests/array/array_diff_uassoc_error.phpt

@@ -52,9 +52,7 @@ try {
 *** Testing array_diff_uassoc() : error conditions ***
 
 -- Testing array_diff_uassoc() function with more than expected no. of arguments --
-
 array_diff_uassoc() expects parameter 4 to be a valid callback, array must have exactly two members
-
 array_diff_uassoc() expects parameter 6 to be a valid callback, array must have exactly two members
 
 -- Testing array_diff_uassoc() function with less than expected no. of arguments --

ext/standard/tests/array/array_diff_ukey_variation10.phpt

@@ -29,10 +29,8 @@ try {
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 *** Testing array_diff_ukey() : usage variation ***
-
 array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name
-
 array_diff_ukey() expects parameter 3 to be a valid callback, function 'unknown_function' not found or invalid function name
 ===DONE===