summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-01-20 11:05:39 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-01-20 11:05:39 +0100
commita48d9ede08fc066ae50dcfbe1f378762ac516e4c (patch)
treeb7fe21288d5061d4c3425e1421521750df9eb5f8
parent32cf58f7ba94933dfc18231596cebe6ffbc66ada (diff)
parent0ad78817a3ccaa3bcd088db068331cc30c774089 (diff)
downloadphp-git-a48d9ede08fc066ae50dcfbe1f378762ac516e4c.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Add missing SKIPIF clauses to new test cases
-rw-r--r--ext/phar/tests/bug69279.phpt1
-rw-r--r--ext/phar/tests/bug79912.phpt1
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