Merge branch 'PHP-5.6'

mbeccati · mbeccati · commit cb5582d3c178 · 2015-08-29T10:48:53.000+02:00
* PHP-5.6:
  Added missing skipif for phar+zlib test
diff --git 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";
