--- embedaddon/php/ext/zlib/tests/gzcompress_error1.phpt	2012/02/21 23:48:05	1.1.1.1
+++ embedaddon/php/ext/zlib/tests/gzcompress_error1.phpt	2012/05/29 12:34:37	1.1.1.2
@@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-/* Prototype  : string gzcompress(string data [, int level])
+/* Prototype  : string gzcompress(string data [, int level, [int encoding]])
  * Description: Gzip-compress a string 
  * Source code: ext/zlib/zlib.c
  * Alias to functions: 
@@ -28,26 +28,30 @@ var_dump( gzcompress() );
 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, $extra_arg) );
+var_dump( gzcompress($data, $level, $encoding, $extra_arg) );
 
 echo "\n-- Testing with incorrect compression level --\n";
 $bad_level = 99;
 var_dump(gzcompress($data, $bad_level));
 
+echo "\n-- Testing with invalid encoding --\n";
+$data = 'string_val';
+$encoding = 99;
+var_dump(gzcompress($data, $level, $encoding));
+
+echo "\n-- Testing with incorrect parameters --\n";
+
 class Tester {
     function Hello() {
         echo "Hello\n"; 
     }
 }
 
-echo "\n-- Testing with incorrect parameters --\n";
 $testclass = new Tester();
 var_dump(gzcompress($testclass));
 
-var_dump(gzcompress($data, $testclass));
-
-
 ?>
 ===Done===
 --EXPECTF--
@@ -60,7 +64,7 @@ NULL
 
 -- Testing gzcompress() function with more than expected no. of arguments --
 
-Warning: gzcompress() expects at most 2 parameters, 3 given in %s on line %d
+Warning: gzcompress() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing with incorrect compression level --
@@ -68,11 +72,13 @@ NULL
 Warning: gzcompress(): compression level (99) must be within -1..9 in %s on line %d
 bool(false)
 
+-- 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)
+
 -- Testing with incorrect parameters --
 
 Warning: gzcompress() expects parameter 1 to be string, object given in %s on line %d
-NULL
-
-Warning: gzcompress() expects parameter 2 to be long, object given in %s on line %d
 NULL
-===Done===
\ No newline at end of file
+===Done===