summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-01-06 11:02:23 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-01-06 11:02:23 +0100
commitb4269664fa2838daf57becf15c5a5f2f0903cf8f (patch)
treec8617e02a52516cc6c4c6f5b979574cf60609792
parent555bd2f0efe29c62cfb193eb541811b58a60d37f (diff)
parent90081c5391552fb9f049ba3b0b1edbe16a510a5e (diff)
downloadphp-git-b4269664fa2838daf57becf15c5a5f2f0903cf8f.tar.gz
Merge branch 'PHP-8.0'
* PHP-8.0: Add missing SKIPIF clause for require_hash.phpt
-rw-r--r--ext/phar/tests/zip/require_hash.phpt5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/phar/tests/zip/require_hash.phpt b/ext/phar/tests/zip/require_hash.phpt
index 994cc0eb67..5cdf3ec148 100644
--- a/ext/phar/tests/zip/require_hash.phpt
+++ b/ext/phar/tests/zip/require_hash.phpt
@@ -1,7 +1,10 @@
--TEST--
Phar: zip-based phar, require_hash=1, no signature
--SKIPIF--
-<?php if (!extension_loaded('phar')) die('skip'); ?>
+<?php
+if (!extension_loaded('phar')) die('skip');
+if (!extension_loaded('zip')) die('skip');
+?>
--INI--
phar.readonly=1
phar.require_hash=0