- Added SKIPIF

diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt
index 3d958927bbcd5f433f1b26aafe244b4ef9161f23..10e6973254b6c2ce44048fae411b5e1cc8ef64ce 100644 (file)
--- a/ext/phar/tests/phar_convert_repeated_b.phpt
+++ b/ext/phar/tests/phar_convert_repeated_b.phpt
@@ -2,6 +2,7 @@
 PharData::convertToZip|Tar|Phar() repeated (phardata_based archives)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=1
 --FILE--

diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt
index 99e5c4f6e7e5694e1e1f0f2c3fd1cc67a6a798e4..72796b0ee38a2e25bc22a61324c22b0b68128464 100644 (file)
--- a/ext/phar/tests/zf_test.phpt
+++ b/ext/phar/tests/zf_test.phpt
@@ -2,6 +2,7 @@
 Phar: test broken app
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --INI--
 phar.readonly=0
 --FILE--

diff --git a/ext/phar/tests/zip/frontcontroller1.phar.phpt b/ext/phar/tests/zip/frontcontroller1.phar.phpt
index 0a6847885d8348567573e077c561ef0e26499e63..b4ace60869e2c0f815c188c36964ce85849b9448 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller1.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller1.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller other zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller1.phar.php
 REQUEST_URI=/frontcontroller1.phar.php/a.jpg

diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index f1fd26bb755ad959b800875788b84020be4ac5ab..f654a02a940dc930aa71db0ce0b1db90a30c4bbf 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type extension is not a string zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.phar.php
 REQUEST_URI=/frontcontroller11.phar.php/a.php

diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index dc5bcdce7836b2a137546facb5bfb14a3e7f064f..91657a2865de1b09123689372a0389fcec1a5431 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type unknown int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.phar.php
 REQUEST_URI=/frontcontroller12.phar.php/a.php

diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 592d6625366278f8cfc86021763ab7a96cf12f98..34d22d4b948f6f372d8d6ffe8ce686168f3c9be6 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type not string/int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.phar.php
 REQUEST_URI=/frontcontroller13.phar.php/a.php

diff --git a/ext/phar/tests/zip/frontcontroller14.phar.phpt b/ext/phar/tests/zip/frontcontroller14.phar.phpt
index 1caa85bc07c7f3dc4f72bd71b44262af62e3f7b8..496160b12fbf3bf61424ddd2aa781e1babd7e730 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller14.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type override, other zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.phar.php
 REQUEST_URI=/frontcontroller14.phar.php/a.jpg

diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
index 89adc0a10626433a1f75941624330d4f7327a23b..a28e5063b132907807f4248abe29c4c83373eb90 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type override, Phar::PHPS zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.phar.php
 REQUEST_URI=/frontcontroller15.phar.php/a.php

diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt
index e27faf39314b9a6ae0ab42945df2aefbfdb05966..c20e915644e40f51f0a12d21af6c67d5c33464ba 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type override, Phar::PHP zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.phar.php
 REQUEST_URI=/frontcontroller16.phar.php/a.phps

diff --git a/ext/phar/tests/zip/frontcontroller17.phar.phpt b/ext/phar/tests/zip/frontcontroller17.phar.phpt
index f85bec291110caf8c983b4fce25fe609bb6950dd..5d52653687434f6bec8032ff399885f40bd7392b 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller mime type unknown zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.phar.php
 REQUEST_URI=/frontcontroller17.phar.php/fronk.gronk

diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt
index c687dd066435fc6483cbc394b126ee60534a760a..dbd09cab1551e39949b5a8e14f2bdcc848dfb2e3 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller $_SERVER munging failure zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.phar.php
 REQUEST_URI=/frontcontroller18.phar.php/fronk.gronk

diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt
index 5b828e9e603a631bca8eae394d1c921f1821dd8b..0eb87bfa60a8469c9ebf3a48cd1bb7f01950b294 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller $_SERVER munging failure 2 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller19.phar.php
 REQUEST_URI=/frontcontroller19.phar.php/

diff --git a/ext/phar/tests/zip/frontcontroller2.phar.phpt b/ext/phar/tests/zip/frontcontroller2.phar.phpt
index 0e101f6d41492a741715dc6eb51937351fd2aa0e..34332203db0b6db99a0b85826066f1c34911541e 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller2.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller PHP test zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.phar.php
 REQUEST_URI=/frontcontroller2.phar.php/a.php

diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt
index 1cf54860acbdf8c3e420c14cc2ad8e97f27ab41f..b1caf52da8ef51016c37d6194de04d2fd7580fc3 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller $_SERVER munging failure 3 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller20.phar.php
 REQUEST_URI=/frontcontroller20.phar.php/

diff --git a/ext/phar/tests/zip/frontcontroller21.phar.phpt b/ext/phar/tests/zip/frontcontroller21.phar.phpt
index d31b730ab8cc2ef4b34f572e21667f8ffb386e41..bb935b39d3fc12ba29a831c3ec2a2222a23b5fde 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller $_SERVER munging success zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.phar.php
 REQUEST_URI=/frontcontroller21.phar.php/index.php?test=hi

diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt
index abe33bb50274bea9d9717d4e4f12138fb700c420..c2466118edb0e4ed5f8640496965c0f5395fef29 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller3.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller phps zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.phar.php
 REQUEST_URI=/frontcontroller3.phar.php/a.phps

diff --git a/ext/phar/tests/zip/frontcontroller4.phar.phpt b/ext/phar/tests/zip/frontcontroller4.phar.phpt
index 6c03620c1cc36b9dcb34faab5975194b0aae995c..ff85eb6ab60713cb5359b547c83581978f797abe 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller4.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller4.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller index.php relocate (no /) zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller4.phar.php
 REQUEST_URI=/frontcontroller4.phar.php

diff --git a/ext/phar/tests/zip/frontcontroller5.phar.phpt b/ext/phar/tests/zip/frontcontroller5.phar.phpt
index 9597a1c14ca1553501b3502f4f184e6361161d14..1705fac4c492be5b9d6244b0c1feb1a2a8f673bd 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller5.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller index.php relocate zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller5.phar.php
 REQUEST_URI=/frontcontroller5.phar.php/

diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt
index 1da20e96d7e0d87d165738406c901e15d5df592f..15489f6ca72801078bf6681b720c5c473ae4f0e8 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller 404 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.phar.php
 REQUEST_URI=/frontcontroller6.phar.php/notfound.php

diff --git a/ext/phar/tests/zip/frontcontroller7.phar.phpt b/ext/phar/tests/zip/frontcontroller7.phar.phpt
index d13cf33c16503da313f004d2ae49e9d901618eee..828da0aeb49458dc0c76c9ff6129ca99c169121e 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller7.phar.phpt
@@ -2,6 +2,7 @@
 Phar front controller alternate index file zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.phar.php
 REQUEST_URI=/frontcontroller7.phar.php/

diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt
index 28187f68b7a37d3764bb038bc3438b4bda3bac92..317c581a56f38e44e20af34b725f42c5f0d05cb5 100644 (file)
--- a/ext/phar/tests/zip/odt.phpt
+++ b/ext/phar/tests/zip/odt.phpt
@@ -3,6 +3,7 @@ Phar: test a zip archive created by openoffice
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
+<?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?>
 --FILE--
 <?php
 $a = new PharData(dirname(__FILE__) . '/files/odt.odt');