Adjust tests for zpp TypeError change

13 files changed, 75 insertions, 400 deletions

diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt
index 92f7db1b70..607228fd6f 100644
--- a/ext/zlib/tests/004-mb.phpt
+++ b/ext/zlib/tests/004-mb.phpt
@@ -5,9 +5,7 @@ gzfile() with various invalid params
 --FILE--
 <?php
 
-var_dump(gzfile());
 var_dump(gzfile("nonexistent_file_gzfile",1));
-var_dump(gzfile(1,1,1));
 
 var_dump(gzfile(dirname(__FILE__)."/004私はガラスを食べられます.txt.gz"));
 var_dump(gzfile(dirname(__FILE__)."/004私はガラスを食べられます.txt.gz", 1));
@@ -15,14 +13,8 @@ var_dump(gzfile(dirname(__FILE__)."/004私はガラスを食べられます.txt.
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d
 bool(false)
-
-Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
-NULL
 array(6) {
   [0]=>
   string(36) "When you're taught through feelings
diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt
index b8d0f0eccd..4437ab154f 100644
--- a/ext/zlib/tests/004.phpt
+++ b/ext/zlib/tests/004.phpt
@@ -5,9 +5,7 @@ gzfile() with various invalid params
 --FILE--
 <?php
 
-var_dump(gzfile());
 var_dump(gzfile("nonexistent_file_gzfile",1));
-var_dump(gzfile(1,1,1));
 
 var_dump(gzfile(dirname(__FILE__)."/004.txt.gz"));
 var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1));
@@ -15,14 +13,8 @@ var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d
 bool(false)
-
-Warning: gzfile() expects at most 2 parameters, 3 given in %s on line %d
-NULL
 array(6) {
   [0]=>
   string(36) "When you're taught through feelings
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 6333612183..69fe8efe6a 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -5,7 +5,6 @@ gzcompress()/gzuncompress() and invalid params
 --FILE--
 <?php
 
-var_dump(gzcompress());
 var_dump(gzcompress("", 1000));
 var_dump(gzcompress("", -1));
 
@@ -19,7 +18,6 @@ Desolation, grief and agony";
 var_dump($data1 = gzcompress($string));
 var_dump($data2 = gzcompress($string, 9));
 
-var_dump(gzuncompress());
 var_dump(gzuncompress("", 1000));
 var_dump(gzuncompress("", -1));
 
@@ -34,9 +32,6 @@ var_dump(gzuncompress($data2));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on line %d
 bool(false)
 string(%d) "%a"
@@ -45,9 +40,6 @@ string(%d) "%a"
 string(%d) "%a"
 string(%d) "%a"
 
-Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzuncompress(): %s error in %s on line %d
 bool(false)
 
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index 0d082092ca..2c666390c8 100644
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -5,7 +5,6 @@ gzdeflate()/gzinflate() and invalid params
 --FILE--
 <?php
 
-var_dump(gzdeflate());
 var_dump(gzdeflate("", 1000));
 var_dump(gzdeflate("", -1));
 
@@ -19,7 +18,6 @@ Desolation, grief and agony";
 var_dump($data1 = gzdeflate($string));
 var_dump($data2 = gzdeflate($string, 9));
 
-var_dump(gzinflate());
 var_dump(gzinflate(""));
 var_dump(gzinflate("asfwe", 1000));
 var_dump(gzinflate("asdf", -1));
@@ -35,9 +33,6 @@ var_dump(gzinflate($data2));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on line %d
 bool(false)
 string(%d) "%a"
@@ -46,9 +41,6 @@ string(%d) "%a"
 string(%d) "%a"
 string(%d) "%a"
 
-Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: gzinflate(): data error in %s on line %d
 bool(false)
 
diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index 6c42bf67db..6028104b9a 100644
--- a/ext/zlib/tests/007.phpt
+++ b/ext/zlib/tests/007.phpt
@@ -5,8 +5,6 @@ gzencode() and invalid params
 --FILE--
 <?php
 
-var_dump(gzencode());
-var_dump(gzencode(1,1,1,1));
 var_dump(gzencode("", -10));
 var_dump(gzencode("", 100));
 var_dump(gzencode("", 1, 100));
@@ -27,12 +25,6 @@ var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzencode() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: gzencode() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
 Warning: gzencode(): compression level (-10) must be within -1..9 in %s on line %d
 bool(false)
 
diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt
index 3f742a4dca..3601c61b53 100644
--- a/ext/zlib/tests/gzcompress_error1.phpt
+++ b/ext/zlib/tests/gzcompress_error1.phpt
@@ -20,53 +20,22 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzcompress() : error conditions ***\n";
 
-// Zero arguments
-echo "\n-- Testing gzcompress() function with Zero arguments --\n";
-var_dump( gzcompress() );
-
-//Test gzcompress with one more than the expected number of arguments
-echo "\n-- Testing gzcompress() function with more than expected no. of arguments --\n";
-$data = 'string_val';
-$level = 2;
-$encoding = ZLIB_ENCODING_RAW;
-$extra_arg = 10;
-var_dump( gzcompress($data, $level, $encoding, $extra_arg) );
-
 echo "\n-- Testing with incorrect compression level --\n";
+$data = 'string_val';
 $bad_level = 99;
 var_dump(gzcompress($data, $bad_level));
 
 echo "\n-- Testing with invalid encoding --\n";
 $data = 'string_val';
+$level = 2;
 $encoding = 99;
 var_dump(gzcompress($data, $level, $encoding));
 
-echo "\n-- Testing with incorrect parameters --\n";
-
-class Tester {
-    function Hello() {
-        echo "Hello\n";
-    }
-}
-
-$testclass = new Tester();
-var_dump(gzcompress($testclass));
-
 ?>
 ===Done===
 --EXPECTF--
 *** Testing gzcompress() : error conditions ***
 
--- Testing gzcompress() function with Zero arguments --
-
-Warning: gzcompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing gzcompress() function with more than expected no. of arguments --
-
-Warning: gzcompress() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
 -- Testing with incorrect compression level --
 
 Warning: gzcompress(): compression level (99) must be within -1..9 in %s on line %d
@@ -76,9 +45,4 @@ bool(false)
 
 Warning: gzcompress(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
-
--- Testing with incorrect parameters --
-
-Warning: gzcompress() expects parameter 1 to be string, object given in %s on line %d
-NULL
 ===Done===
diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 93f8c03b4c..af74d1c771 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -20,52 +20,22 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzdeflate() : error conditions ***\n";
 
-// Zero arguments
-echo "\n-- Testing gzdeflate() function with Zero arguments --\n";
-var_dump( gzdeflate() );
-
-//Test gzdeflate with one more than the expected number of arguments
-echo "\n-- Testing gzdeflate() function with more than expected no. of arguments --\n";
 $data = 'string_val';
-$level = 2;
-$encoding = ZLIB_ENCODING_RAW;
-$extra_arg = 10;
-var_dump( gzdeflate($data, $level, $encoding, $extra_arg) );
 
 echo "\n-- Testing with incorrect compression level --\n";
 $bad_level = 99;
 var_dump(gzdeflate($data, $bad_level));
 
 echo "\n-- Testing with incorrect encoding --\n";
+$level = 2;
 $bad_encoding = 99;
 var_dump(gzdeflate($data, $level, $bad_encoding));
 
-class Tester {
-    function Hello() {
-        echo "Hello\n";
-    }
-}
-
-echo "\n-- Testing with incorrect parameters --\n";
-$testclass = new Tester();
-var_dump(gzdeflate($testclass));
-var_dump(gzdeflate($data, $testclass));
-
 ?>
 ===Done===
 --EXPECTF--
 *** Testing gzdeflate() : error conditions ***
 
--- Testing gzdeflate() function with Zero arguments --
-
-Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing gzdeflate() function with more than expected no. of arguments --
-
-Warning: gzdeflate() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
 -- Testing with incorrect compression level --
 
 Warning: gzdeflate(): compression level (99) must be within -1..9 in %s on line %d
@@ -75,12 +45,4 @@ bool(false)
 
 Warning: gzdeflate(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
-
--- Testing with incorrect parameters --
-
-Warning: gzdeflate() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: gzdeflate() expects parameter 2 to be int, object given in %s on line %d
-NULL
 ===Done===
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index ac846866c5..15b70afb8a 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -20,17 +20,9 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzencode() : error conditions ***\n";
 
-// Zero arguments
-echo "\n-- Testing gzencode() function with Zero arguments --\n";
-var_dump( gzencode() );
-
-//Test gzencode with one more than the expected number of arguments
-echo "\n-- Testing gzencode() function with more than expected no. of arguments --\n";
 $data = 'string_val';
 $level = 2;
 $encoding_mode = FORCE_DEFLATE;
-$extra_arg = 10;
-var_dump( gzencode($data, $level, $encoding_mode, $extra_arg) );
 
 echo "\n-- Testing with incorrect compression level --\n";
 $bad_level = 99;
@@ -40,35 +32,11 @@ echo "\n-- Testing with incorrect encoding_mode --\n";
 $bad_mode = 99;
 var_dump(gzencode($data, $level, $bad_mode));
 
-class Tester {
-    function Hello() {
-        echo "Hello\n";
-    }
-}
-
-echo "\n-- Testing with incorrect parameters --\n";
-$testclass = new Tester();
-var_dump(gzencode($testclass));
-var_dump(gzencode($data, $testclass));
-var_dump(gzencode($data, -1, 99.99));
-var_dump(gzencode($data, -1, $testclass));
-var_dump(gzencode($data, "a very none numeric string\n"));
-
 ?>
 ===Done===
 --EXPECTF--
 *** Testing gzencode() : error conditions ***
 
--- Testing gzencode() function with Zero arguments --
-
-Warning: gzencode() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing gzencode() function with more than expected no. of arguments --
-
-Warning: gzencode() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
 -- Testing with incorrect compression level --
 
 Warning: gzencode(): compression level (99) must be within -1..9 in %s on line %d
@@ -78,21 +46,4 @@ bool(false)
 
 Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
-
--- Testing with incorrect parameters --
-
-Warning: gzencode() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: gzencode() expects parameter 2 to be int, object given in %s on line %d
-NULL
-
-Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
-
-Warning: gzencode() expects parameter 3 to be int, object given in %s on line %d
-NULL
-
-Warning: gzencode() expects parameter 2 to be int, string given in %s on line %d
-NULL
 ===Done===
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index cbfe615511..5b8e40620c 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -18,58 +18,20 @@ include(dirname(__FILE__) . '/data.inc');
 
 echo "*** Testing gzinflate() : error conditions ***\n";
 
-echo "\n-- Testing gzcompress() function with Zero arguments --\n";
-var_dump( gzinflate() );
-
-echo "\n-- Testing gzcompress() function with more than expected no. of arguments --\n";
-$data = 'string_val';
-$length = 10;
-$extra_arg = 10;
-var_dump( gzinflate($data, $length, $extra_arg) );
-
 echo "\n-- Testing with a buffer that is too small --\n";
+$data = 'string_val';
 $short_len = strlen($data) - 1;
 $compressed = gzcompress($data);
 
 var_dump(gzinflate($compressed, $short_len));
 
-echo "\n-- Testing with incorrect parameters --\n";
-
-class Tester {
-    function Hello() {
-        echo "Hello\n";
-    }
-}
-
-$testclass = new Tester();
-var_dump(gzinflate($testclass));
-var_dump(gzinflate($data, $testclass));
-
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing gzinflate() : error conditions ***
 
--- Testing gzcompress() function with Zero arguments --
-
-Warning: gzinflate() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing gzcompress() function with more than expected no. of arguments --
-
-Warning: gzinflate() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-
 -- Testing with a buffer that is too small --
 
 Warning: gzinflate(): data error in %s on line %d
 bool(false)
-
--- Testing with incorrect parameters --
-
-Warning: gzinflate() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: gzinflate() expects parameter 2 to be int, object given in %s on line %d
-NULL
 ===DONE===
diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index baa9c715ae..b02c7152a8 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -32,73 +32,82 @@ restore_include_path();
 chdir($baseDir);
 rmdir($workingDir);
 foreach($newdirs as $newdir) {
-   rmdir($newdir);
+    rmdir($newdir);
 }
 
 chdir("..");
 rmdir($thisTestDir);
 
 function test_gzopen($mode) {
-   global $scriptFile, $secondFile, $firstFile, $filename;
-
-   // create a file in the middle directory
-   $h = gzopen($secondFile, "w");
-   gzwrite($h, "This is a file in dir2");
-   gzclose($h);
-
-   echo "\n** testing with mode=$mode **\n";
-   // should read dir2 file
-   $h = gzopen($filename, $mode, true);
-   gzpassthru($h);
-   gzclose($h);
-   echo "\n";
-
-   //create a file in dir1
-   $h = gzopen($firstFile, "w");
-   gzwrite($h, "This is a file in dir1");
-   gzclose($h);
-
-   //should now read dir1 file
-   $h = gzopen($filename, $mode, true);
-   gzpassthru($h);
-   gzclose($h);
-   echo "\n";
-
-   // create a file in working directory
-   $h = gzopen($filename, "w");
-   gzwrite($h, "This is a file in working dir");
-   gzclose($h);
-
-   //should still read dir1 file
-   $h = gzopen($filename, $mode, true);
-   gzpassthru($h);
-   gzclose($h);
-   echo "\n";
-
-   unlink($firstFile);
-   unlink($secondFile);
-
-   //should read the file in working dir
-   $h = gzopen($filename, $mode, true);
-   gzpassthru($h);
-   gzclose($h);
-   echo "\n";
-
-   // create a file in the script directory
-   $h = gzopen($scriptFile, "w");
-   gzwrite($h, "This is a file in script dir");
-   gzclose($h);
-
-   //should read the file in script dir
-   $h = gzopen($filename, $mode, true);
-   gzpassthru($h);
-   gzclose($h);
-   echo "\n";
-
-   //cleanup
-   unlink($filename);
-   unlink($scriptFile);
-
+    global $scriptFile, $secondFile, $firstFile, $filename;
+
+    // create a file in the middle directory
+    $h = gzopen($secondFile, "w");
+    gzwrite($h, "This is a file in dir2");
+    gzclose($h);
+
+    echo "\n** testing with mode=$mode **\n";
+    // should read dir2 file
+    $h = gzopen($filename, $mode, true);
+    if ($h) {
+        gzpassthru($h);
+        gzclose($h);
+        echo "\n";
+    }
+
+    //create a file in dir1
+    $h = gzopen($firstFile, "w");
+    gzwrite($h, "This is a file in dir1");
+    gzclose($h);
+
+    //should now read dir1 file
+    $h = gzopen($filename, $mode, true);
+    if ($h) {
+        gzpassthru($h);
+        gzclose($h);
+        echo "\n";
+    }
+
+    // create a file in working directory
+    $h = gzopen($filename, "w");
+    gzwrite($h, "This is a file in working dir");
+    gzclose($h);
+
+    //should still read dir1 file
+    $h = gzopen($filename, $mode, true);
+    if ($h) {
+        gzpassthru($h);
+        gzclose($h);
+        echo "\n";
+    }
+
+    unlink($firstFile);
+    unlink($secondFile);
+
+    //should read the file in working dir
+    $h = gzopen($filename, $mode, true);
+    if ($h) {
+        gzpassthru($h);
+        gzclose($h);
+        echo "\n";
+    }
+
+    // create a file in the script directory
+    $h = gzopen($scriptFile, "w");
+    gzwrite($h, "This is a file in script dir");
+    gzclose($h);
+
+    //should read the file in script dir
+    $h = gzopen($filename, $mode, true);
+    if ($h) {
+        gzpassthru($h);
+        gzclose($h);
+        echo "\n";
+    }
+
+    //cleanup
+    unlink($filename);
+    unlink($scriptFile);
 }
 
 ?>
@@ -119,39 +128,14 @@ This is a file in script dir
 
 Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
 
-Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-
-Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
-
-
 Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
 
-Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-
-Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
-
-
 Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
 
-Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-
-Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
-
-
 Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
 
-Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-
-Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
-
-
 Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d
 
-Warning: gzpassthru() expects parameter 1 to be resource, bool given in %s on line %d
-
-Warning: gzclose() expects parameter 1 to be resource, bool given in %s on line %d
-
-
 ** testing with mode=rt **
 This is a file in dir2
 This is a file in dir1
diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index f200951d4c..8683a6c829 100644
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -16,18 +16,8 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzuncompress() : error conditions ***\n";
 
-// Zero arguments
-echo "\n-- Testing gzuncompress() function with Zero arguments --\n";
-var_dump( gzuncompress() );
-
-//Test gzuncompress with one more than the expected number of arguments
-echo "\n-- Testing gzuncompress() function with more than expected no. of arguments --\n";
-$data = 'string_val';
-$length = 10;
-$extra_arg = 10;
-var_dump( gzuncompress($data, $length, $extra_arg) );
-
 echo "\n-- Testing with a buffer that is too small --\n";
+$data = 'string_val';
 $short_len = strlen($data) - 1;
 $compressed = gzcompress($data);
 
@@ -36,32 +26,11 @@ var_dump(gzuncompress($compressed, $short_len));
 echo "\n-- Testing with incorrect arguments --\n";
 var_dump(gzuncompress(123));
 
-class Tester {
-    function Hello() {
-        echo "Hello\n";
-    }
-}
-
-$testclass = new Tester();
-var_dump(gzuncompress($testclass));
-
-var_dump(gzuncompress($compressed, "this is not a number\n"));
-
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing gzuncompress() : error conditions ***
 
--- Testing gzuncompress() function with Zero arguments --
-
-Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing gzuncompress() function with more than expected no. of arguments --
-
-Warning: gzuncompress() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-
 -- Testing with a buffer that is too small --
 
 Warning: gzuncompress(): insufficient memory in %s on line %d
@@ -71,10 +40,4 @@ bool(false)
 
 Warning: gzuncompress(): data error in %s on line %d
 bool(false)
-
-Warning: gzuncompress() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: gzuncompress() expects parameter 2 to be int, string given in %s on line %d
-NULL
 ===DONE===
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt
index 58773e61d3..504f795aec 100644
--- a/ext/zlib/tests/inflate_init_error.phpt
+++ b/ext/zlib/tests/inflate_init_error.phpt
@@ -8,12 +8,8 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-var_dump(inflate_init());
 var_dump(inflate_init(42));
 ?>
 --EXPECTF--
-Warning: inflate_init() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
 Warning: inflate_init(): encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
 bool(false)
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
deleted file mode 100644
index 004a07775a..0000000000
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-Test function readgzfile() by substituting argument 2 with emptyUnsetUndefNull values.
---SKIPIF--
-<?php
-if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
-?>
---FILE--
-<?php
-
-
-$filename = dirname(__FILE__)."/004.txt.gz";
-
-
-$unset_var = 10;
-unset($unset_var);
-
-$variation = array(
-  'unset var' => @$unset_var,
-  'undefined var' => @$undefined_var,
-  'empty string DQ' => "",
-  'empty string SQ' => '',
-  'uppercase NULL' => NULL,
-  'lowercase null' => null,
-  );
-
-
-foreach ( $variation as $var ) {
-  var_dump(readgzfile( $filename, $var  ) );
-}
-?>
-===DONE===
---EXPECTF--
-When you're taught through feelings
-Destiny flying high above
-all I know is that you can realize it
-Destiny who cares
-as it turns around
-and I know that it descends down on me
-int(176)
-When you're taught through feelings
-Destiny flying high above
-all I know is that you can realize it
-Destiny who cares
-as it turns around
-and I know that it descends down on me
-int(176)
-
-Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
-NULL
-
-Warning: readgzfile() expects parameter 2 to be int, string given in %s on line %d
-NULL
-When you're taught through feelings
-Destiny flying high above
-all I know is that you can realize it
-Destiny who cares
-as it turns around
-and I know that it descends down on me
-int(176)
-When you're taught through feelings
-Destiny flying high above
-all I know is that you can realize it
-Destiny who cares
-as it turns around
-and I know that it descends down on me
-int(176)
-===DONE===