Get rid of zip requirement in the last few tests

@Greg: zip/tarmaker.inc needs a rewrite

diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 79b4b149efc1f651be8e1eb825dc58377689ff36..0f02ccb474391cd3293ca3451c0568a20b8a8a8e 100644 (file)
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -2,7 +2,6 @@
 Phar::convertToZip()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0

diff --git a/ext/phar/tests/zip/033.phpt b/ext/phar/tests/zip/033.phpt
index b2855368bd1b7131249ad2220793fb0adee6f78d..410fd56f60e3ce1bd207dfdf28b09686404d9b1c 100644 (file)
--- a/ext/phar/tests/zip/033.phpt
+++ b/ext/phar/tests/zip/033.phpt
@@ -2,7 +2,6 @@
 Phar::chmod zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index 77f1925c9e780336b6a73aa3503d119b5932b3d1..65d67e6f082be59e6fb7b8428916886e47015a25 100644 (file)
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -2,7 +2,6 @@
 Phar::chmod zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt
index 0197fb83812253e75aa74cd2167edfb27f94da92..b81e5a779f6fbf1461f91bda563835fddba5ea9c 100644 (file)
--- a/ext/phar/tests/zip/create_new_and_modify.phpt
+++ b/ext/phar/tests/zip/create_new_and_modify.phpt
@@ -3,7 +3,6 @@ Phar: create and modify zip-based phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 --FILE--

diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index 3029809bee485fa82a5e8cb49b85b9db7683017b..5aec78d2b99856a87502156c5f3514b6c4de7c83 100644 (file)
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -2,7 +2,6 @@
 Phar: create a completely new zip-based phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=1

diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt
index 77ae85f909aededaa27581bafce428912148d668..85b4a44d4e7b71035578bdce4b187e3dd8a88649 100644 (file)
--- a/ext/phar/tests/zip/delete.phpt
+++ b/ext/phar/tests/zip/delete.phpt
@@ -2,7 +2,6 @@
 Phar: delete test, zip-based phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt
index ec743b53c4642a1b347e5447a1ee8705e1a30c0f..43f6874c0c3938ba5c656ca1668c04fbaae865d2 100644 (file)
--- a/ext/phar/tests/zip/delete_in_phar.phpt
+++ b/ext/phar/tests/zip/delete_in_phar.phpt
@@ -2,7 +2,6 @@
 Phar: delete a file within a zip-based .phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt
index 2816b10437c1bb33c7bc9d2267fdc59f1e7ebb84..0a7336fee9e66411ed7f5aa753e6f026d3e4d50e 100644 (file)
--- a/ext/phar/tests/zip/delete_in_phar_b.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_b.phpt
@@ -2,7 +2,6 @@
 Phar: delete a file within a zip-based .phar
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=1
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
index 9ffe718a85cdfdadbef0a1e37242150b7a43b8e5..29743e01324b8584913e8e99f6db8a529abc24be 100644 (file)
--- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt
@@ -2,7 +2,6 @@
 Phar: delete a file within a zip-based .phar (confirm disk file is changed)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/dir.phpt b/ext/phar/tests/zip/dir.phpt
index 4148aee968980830b09e53cf63bc5bea45b728b2..889dfff6562a604befb9b387f4ccb98769438cab 100644 (file)
--- a/ext/phar/tests/zip/dir.phpt
+++ b/ext/phar/tests/zip/dir.phpt
@@ -2,7 +2,6 @@
 Phar: mkdir/rmdir test zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0