From: Matteo Beccati <mbeccati@php.net>
Date: Sat, 29 Aug 2015 08:48:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-5.5.30~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a12cef979db2466dd98d46cffd0a32c6eb2957c3;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Added missing skipif for phar+zlib test
---

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";