diff options
Diffstat (limited to 'ext/zlib')
-rw-r--r-- | ext/zlib/tests/gzfile_basic.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/gzfile_basic2.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/gzreadgzwrite.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/gzreadgzwriteplain.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/gzrewind_variation1.phpt | 4 | ||||
-rw-r--r-- | ext/zlib/tests/gztell_basic2.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/gzwrite_variation1.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/readgzfile_basic.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/readgzfile_basic2.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/tests/zlib_filter_inflate2.phpt | 2 | ||||
-rw-r--r-- | ext/zlib/zlib_filter.c | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/ext/zlib/tests/gzfile_basic.phpt b/ext/zlib/tests/gzfile_basic.phpt index 17055646d8..56bc8b2d7a 100644 --- a/ext/zlib/tests/gzfile_basic.phpt +++ b/ext/zlib/tests/gzfile_basic.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b ?> --FILE-- <?php -$plaintxt = b<<<EOT +$plaintxt = <<<EOT hello world is a very common test for all languages diff --git a/ext/zlib/tests/gzfile_basic2.phpt b/ext/zlib/tests/gzfile_basic2.phpt index 2bbf315a1a..0a968ce394 100644 --- a/ext/zlib/tests/gzfile_basic2.phpt +++ b/ext/zlib/tests/gzfile_basic2.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b ?> --FILE-- <?php -$plaintxt = b<<<EOT +$plaintxt = <<<EOT hello world is a very common test for all languages diff --git a/ext/zlib/tests/gzreadgzwrite.phpt b/ext/zlib/tests/gzreadgzwrite.phpt index d52f12a4ac..817002807f 100644 --- a/ext/zlib/tests/gzreadgzwrite.phpt +++ b/ext/zlib/tests/gzreadgzwrite.phpt @@ -5,7 +5,7 @@ gzopen(), gzread(), gzwrite() if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = str_repeat(b"hallo php",4096); +$original = str_repeat("hallo php",4096); $filename = tempnam(sys_get_temp_dir(), "phpt"); $fp = gzopen($filename, "wb"); diff --git a/ext/zlib/tests/gzreadgzwriteplain.phpt b/ext/zlib/tests/gzreadgzwriteplain.phpt index 7a5a5025aa..58901ac08f 100644 --- a/ext/zlib/tests/gzreadgzwriteplain.phpt +++ b/ext/zlib/tests/gzreadgzwriteplain.phpt @@ -5,7 +5,7 @@ gzopen(), gzread(), gzwrite() for non-compressed data if (!extension_loaded("zlib")) print "skip"; ?> --FILE-- <?php -$original = str_repeat(b"hallo php",4096); +$original = str_repeat("hallo php",4096); $filename = tempnam(sys_get_temp_dir(), "phpt"); $fp = fopen($filename, "wb"); diff --git a/ext/zlib/tests/gzrewind_variation1.phpt b/ext/zlib/tests/gzrewind_variation1.phpt index 82018627f4..3eef10e93f 100644 --- a/ext/zlib/tests/gzrewind_variation1.phpt +++ b/ext/zlib/tests/gzrewind_variation1.phpt @@ -10,9 +10,9 @@ if (!extension_loaded("zlib")) { <?php $f = "temp2.txt.gz"; $h = gzopen($f, 'w'); -gzwrite($h, b'The first string.'); +gzwrite($h, 'The first string.'); var_dump(gzrewind($h)); -gzwrite($h, b'The second string.'); +gzwrite($h, 'The second string.'); gzclose($h); $h = gzopen($f, 'r'); diff --git a/ext/zlib/tests/gztell_basic2.phpt b/ext/zlib/tests/gztell_basic2.phpt index a8574eeaa6..d7a55895ef 100644 --- a/ext/zlib/tests/gztell_basic2.phpt +++ b/ext/zlib/tests/gztell_basic2.phpt @@ -15,7 +15,7 @@ $sizes = array(7, 22, 54, 17, 27, 15, 1000); var_dump(gztell($h)); foreach ($sizes as $size) { - echo "bytes written=".gzwrite($h, str_repeat(b'1', $size))."\n";; + echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n";; echo "tell=".gztell($h)."\n"; } diff --git a/ext/zlib/tests/gzwrite_variation1.phpt b/ext/zlib/tests/gzwrite_variation1.phpt index ab6c2606b4..bd3778e366 100644 --- a/ext/zlib/tests/gzwrite_variation1.phpt +++ b/ext/zlib/tests/gzwrite_variation1.phpt @@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) { $filename = dirname(__FILE__)."/004.txt.gz"; $h = gzopen($filename, 'r'); -$str = b"Here is the string to be written. "; +$str = "Here is the string to be written. "; $length = 10; var_dump(gzwrite( $h, $str ) ); var_dump(gzread($h, 10)); diff --git a/ext/zlib/tests/readgzfile_basic.phpt b/ext/zlib/tests/readgzfile_basic.phpt index 5fd539e21c..09bcc4c534 100644 --- a/ext/zlib/tests/readgzfile_basic.phpt +++ b/ext/zlib/tests/readgzfile_basic.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b ?> --FILE-- <?php -$plaintxt = b<<<EOT +$plaintxt = <<<EOT hello world is a very common test for all languages diff --git a/ext/zlib/tests/readgzfile_basic2.phpt b/ext/zlib/tests/readgzfile_basic2.phpt index 5402f960c2..a835883aaa 100644 --- a/ext/zlib/tests/readgzfile_basic2.phpt +++ b/ext/zlib/tests/readgzfile_basic2.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b ?> --FILE-- <?php -$plaintxt = b<<<EOT +$plaintxt = <<<EOT hello world is a very common test for all languages diff --git a/ext/zlib/tests/zlib_filter_inflate2.phpt b/ext/zlib/tests/zlib_filter_inflate2.phpt index a2099b6f7a..de3d968959 100644 --- a/ext/zlib/tests/zlib_filter_inflate2.phpt +++ b/ext/zlib/tests/zlib_filter_inflate2.phpt @@ -6,7 +6,7 @@ zlib.inflate of gzip-encoded stream <?php /* $Id$ */ $a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w'); -fwrite($a, b"This is quite the thing ain't it\n"); +fwrite($a, "This is quite the thing ain't it\n"); fclose($a); $fp = fopen(dirname(__FILE__) . '/test.txt.gz', 'r'); diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 4018e253ae..e48c5d60f3 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -286,7 +286,7 @@ static php_stream_filter_ops php_zlib_deflate_ops = { /* {{{ zlib.* common factory */ -static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *filterparams, int persistent) +static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *filterparams, uint8_t persistent) { php_stream_filter_ops *fops = NULL; php_zlib_filter_data *data; |