diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-20 11:04:48 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-20 11:04:48 +0100 |
commit | 0ad78817a3ccaa3bcd088db068331cc30c774089 (patch) | |
tree | 53be49897e2edf319321ed1c5782814cfebae8a0 | |
parent | 286c13e1e6d079a1128dab68ba3c80b9a390350c (diff) | |
parent | 4c1b3e3036ff275b2a848bdba5a93b1ca486382b (diff) | |
download | php-git-0ad78817a3ccaa3bcd088db068331cc30c774089.tar.gz |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing SKIPIF clauses to new test cases
-rw-r--r-- | ext/phar/tests/bug69279.phpt | 1 | ||||
-rw-r--r-- | ext/phar/tests/bug79912.phpt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/phar/tests/bug69279.phpt b/ext/phar/tests/bug69279.phpt index 6aeac12d3b..17a280d3da 100644 --- a/ext/phar/tests/bug69279.phpt +++ b/ext/phar/tests/bug69279.phpt @@ -3,6 +3,7 @@ Bug #69279 (Compressed ZIP Phar extractTo() creates garbage files) --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip phar extension not available'); +if (!extension_loaded('zlib')) die('skip zlib extension not available'); ?> --INI-- phar.readonly=0 diff --git a/ext/phar/tests/bug79912.phpt b/ext/phar/tests/bug79912.phpt index 7187b4f55e..2a134a77df 100644 --- a/ext/phar/tests/bug79912.phpt +++ b/ext/phar/tests/bug79912.phpt @@ -3,6 +3,7 @@ Bug #79912 (Phar::decompressFiles not working) --SKIPIF-- <?php if (!extension_loaded('phar')) die('skip phar extension is not available'); +if (!extension_loaded('zlib')) die('skip zlib extension not available'); ?> --INI-- phar.readonly=0 |