summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2015-08-29 10:48:53 +0200
committerFerenc Kovacs <tyrael@php.net>2015-09-03 01:53:40 +0200
commitbb151b0a755ffc2623f029666b18384bb0b336bb (patch)
treeb4ad9eb93cc451d1fbefd9bc592759aa15aa4110
parenta4c64d152cee3f71fd931b18ef4b8a540337ee72 (diff)
downloadphp-git-bb151b0a755ffc2623f029666b18384bb0b336bb.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Added missing skipif for phar+zlib test
-rw-r--r--ext/phar/tests/bug70019.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt
index d7976a180d..85bf1780aa 100644
--- a/ext/phar/tests/bug70019.phpt
+++ b/ext/phar/tests/bug70019.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #70019 Files extracted from archive may be placed outside of destination directory
+--SKIPIF--
+<?php if (!extension_loaded("phar") || !extension_loaded('zlib')) die("skip"); ?>
--FILE--
<?php
$dir = __DIR__."/bug70019";