Convert some warnings to Error in zlib extension

ext/zlib/tests/005.phpt

@@ -5,9 +5,13 @@ gzcompress()/gzuncompress() and invalid params
 --FILE--
 <?php
 
-var_dump(gzcompress("", 1000));
-var_dump(gzcompress("", -1));
+try {
+    var_dump(gzcompress("", 1000));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
+var_dump(gzcompress("", -1));
 var_dump(gzcompress(""));
 var_dump(gzcompress("", 9));
 
@@ -18,8 +22,17 @@ Desolation, grief and agony";
 var_dump($data1 = gzcompress($string));
 var_dump($data2 = gzcompress($string, 9));
 
-var_dump(gzuncompress("", 1000));
-var_dump(gzuncompress("", -1));
+try {
+    var_dump(gzuncompress("", 1000));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
+try {
+    var_dump(gzuncompress("", -1));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 var_dump(gzuncompress(""));
 var_dump(gzuncompress("", 9));
@@ -29,11 +42,9 @@ var_dump(gzuncompress($data2));
 $data2[4] = 0;
 var_dump(gzuncompress($data2));
 
-echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzcompress(): compression level (1000) must be within -1..9 in %s on line %d
-bool(false)
+compression level (1000) must be within -1..9
 string(%d) "%a"
 string(%d) "%a"
 string(%d) "%a"
@@ -42,9 +53,7 @@ string(%d) "%a"
 
 Warning: gzuncompress(): %s error in %s on line %d
 bool(false)
-
-Warning: gzuncompress(): length (-1) must be greater or equal zero in %s on line %d
-bool(false)
+length (-1) must be greater or equal zero
 
 Warning: gzuncompress(): %s error in %s on line %d
 bool(false)
@@ -60,4 +69,3 @@ Desolation, grief and agony"
 
 Warning: gzuncompress(): %s error in %s on line %d
 bool(false)
-Done

ext/zlib/tests/006.phpt

@@ -5,7 +5,12 @@ gzdeflate()/gzinflate() and invalid params
 --FILE--
 <?php
 
-var_dump(gzdeflate("", 1000));
+try {
+    var_dump(gzcompress("", 1000));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
 var_dump(gzdeflate("", -1));
 
 var_dump(gzdeflate(""));
@@ -20,7 +25,12 @@ var_dump($data2 = gzdeflate($string, 9));
 
 var_dump(gzinflate(""));
 var_dump(gzinflate("asfwe", 1000));
-var_dump(gzinflate("asdf", -1));
+
+try {
+    var_dump(gzinflate("asdf", -1));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 var_dump(gzinflate("asdf"));
 var_dump(gzinflate("asdf", 9));
@@ -30,11 +40,9 @@ var_dump(gzinflate($data2));
 $data2[4] = 0;
 var_dump(gzinflate($data2));
 
-echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzdeflate(): compression level (1000) must be within -1..9 in %s on line %d
-bool(false)
+compression level (1000) must be within -1..9
 string(%d) "%a"
 string(%d) "%a"
 string(%d) "%a"
@@ -46,9 +54,7 @@ bool(false)
 
 Warning: gzinflate(): data error in %s on line %d
 bool(false)
-
-Warning: gzinflate(): length (-1) must be greater or equal zero in %s on line %d
-bool(false)
+length (-1) must be greater or equal zero
 
 Warning: gzinflate(): data error in %s on line %d
 bool(false)
@@ -64,4 +70,3 @@ Desolation, grief and agony"
 
 Warning: gzinflate(): data error in %s on line %d
 bool(false)
-Done

ext/zlib/tests/007.phpt

@@ -5,9 +5,21 @@ gzencode() and invalid params
 --FILE--
 <?php
 
-var_dump(gzencode("", -10));
-var_dump(gzencode("", 100));
-var_dump(gzencode("", 1, 100));
+try {
+    var_dump(gzencode("", -10));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(gzencode("", 100));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(gzencode("", 1, 100));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 var_dump(gzencode("", -1, ZLIB_ENCODING_GZIP));
 var_dump(gzencode("", 9, ZLIB_ENCODING_DEFLATE));
@@ -17,27 +29,22 @@ Light in this temple
 Light in my truth
 Lies in the darkness";
 
-var_dump(gzencode($string, 9, 3));
+try {
+    var_dump(gzencode($string, 9, 3));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 var_dump(gzencode($string, -1, ZLIB_ENCODING_GZIP));
 var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE));
 
-echo "Done\n";
 ?>
 --EXPECTF--
-Warning: gzencode(): compression level (-10) must be within -1..9 in %s on line %d
-bool(false)
-
-Warning: gzencode(): compression level (100) must be within -1..9 in %s on line %d
-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)
+compression level (-10) must be within -1..9
+compression level (100) must be within -1..9
+encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
 string(%d) "%a"
 string(%d) "%a"
-
-Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
+encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
 string(%d) "%a"
 string(%d) "%a"
-Done

ext/zlib/tests/deflate_add_error.phpt

@@ -9,15 +9,23 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 $badResource = fopen("php://memory", "r+");
-var_dump(deflate_add($badResource, "test"));
+
+try {
+    var_dump(deflate_add($badResource, "test"));
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 $resource = deflate_init(ZLIB_ENCODING_DEFLATE);
 $badFlushType = 6789;
-var_dump(deflate_add($resource, "test", $badFlushType));
-?>
---EXPECTF--
-Warning: deflate_add(): Invalid deflate resource in %s on line %d
-bool(false)
 
-Warning: deflate_add(): flush mode must be ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK or ZLIB_FINISH in %s on line %d
-bool(false)
+try {
+    var_dump(deflate_add($resource, "test", $badFlushType));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
+?>
+--EXPECT--
+deflate_add(): supplied resource is not a valid zlib deflate resource
+flush mode must be ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK or ZLIB_FINISH

ext/zlib/tests/deflate_init_error.phpt

@@ -8,24 +8,41 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-var_dump(deflate_init(42));
-var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => 42]));
-var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => -2]));
-var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 0]));
-var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 10]));
-?>
---EXPECTF--
-Warning: deflate_init(): encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
 
-Warning: deflate_init(): compression level (42) must be within -1..9 in %s on line %d
-bool(false)
+try {
+    var_dump(deflate_init(42));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
-Warning: deflate_init(): compression level (-2) must be within -1..9 in %s on line %d
-bool(false)
+try {
+    var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => 42]));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
-Warning: deflate_init(): compression memory level (0) must be within 1..9 in %s on line %d
-bool(false)
+try {
+    var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['level' => -2]));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
-Warning: deflate_init(): compression memory level (10) must be within 1..9 in %s on line %d
-bool(false)
+try {
+    var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 0]));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
+try {
+    var_dump(deflate_init(ZLIB_ENCODING_DEFLATE, ['memory' => 10]));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+
+?>
+--EXPECT--
+encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
+compression level (42) must be within -1..9
+compression level (-2) must be within -1..9
+compression memory level (0) must be within 1..9
+compression memory level (10) must be within 1..9

ext/zlib/tests/gzcompress_error1.phpt

@@ -23,24 +23,28 @@ echo "*** Testing gzcompress() : error conditions ***\n";
 echo "\n-- Testing with incorrect compression level --\n";
 $data = 'string_val';
 $bad_level = 99;
-var_dump(gzcompress($data, $bad_level));
+try {
+    var_dump(gzcompress($data, $bad_level));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 echo "\n-- Testing with invalid encoding --\n";
 $data = 'string_val';
 $level = 2;
 $encoding = 99;
-var_dump(gzcompress($data, $level, $encoding));
+try {
+    var_dump(gzcompress($data, $level, $encoding));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing gzcompress() : error conditions ***
 
 -- Testing with incorrect compression level --
-
-Warning: gzcompress(): compression level (99) must be within -1..9 in %s on line %d
-bool(false)
+compression level (99) must be within -1..9
 
 -- Testing with invalid encoding --
-
-Warning: gzcompress(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
+encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE

ext/zlib/tests/gzdeflate_error1.phpt

@@ -24,23 +24,27 @@ $data = 'string_val';
 
 echo "\n-- Testing with incorrect compression level --\n";
 $bad_level = 99;
-var_dump(gzdeflate($data, $bad_level));
+try {
+    var_dump(gzdeflate($data, $bad_level));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 echo "\n-- Testing with incorrect encoding --\n";
 $level = 2;
 $bad_encoding = 99;
-var_dump(gzdeflate($data, $level, $bad_encoding));
+try {
+    var_dump(gzdeflate($data, $level, $bad_encoding));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing gzdeflate() : error conditions ***
 
 -- Testing with incorrect compression level --
-
-Warning: gzdeflate(): compression level (99) must be within -1..9 in %s on line %d
-bool(false)
+compression level (99) must be within -1..9
 
 -- Testing with incorrect encoding --
-
-Warning: gzdeflate(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
+encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE

ext/zlib/tests/gzencode_error1.phpt

@@ -26,22 +26,26 @@ $encoding_mode = FORCE_DEFLATE;
 
 echo "\n-- Testing with incorrect compression level --\n";
 $bad_level = 99;
-var_dump(gzencode($data, $bad_level));
+try {
+    var_dump(gzencode($data, $bad_level));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 echo "\n-- Testing with incorrect encoding_mode --\n";
 $bad_mode = 99;
-var_dump(gzencode($data, $level, $bad_mode));
+try {
+    var_dump(gzencode($data, $level, $bad_mode));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing gzencode() : error conditions ***
 
 -- Testing with incorrect compression level --
-
-Warning: gzencode(): compression level (99) must be within -1..9 in %s on line %d
-bool(false)
+compression level (99) must be within -1..9
 
 -- Testing with incorrect encoding_mode --
-
-Warning: gzencode(): encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE in %s on line %d
-bool(false)
+encoding mode must be either ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE