Get rid of zip requirement

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

diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt
index 42c938c411b7f585db706901e8781684d2fba383..025becd6709e946e51473c47fd59b01c9495a44d 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller rewrite array invalid zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller10.phar.php/hi
 REQUEST_URI=/frontcontroller10.phar.php/hi

diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index 9b0dbe5d52e73b1d6a2d9ff46cecae79764cdb4e..789138f329b1756d11b342281ea785d3db8cfbcc 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type extension is not a string zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller11.phar.php/a.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 95c564147e2d22c2e95e83f421e1b8be38d51045..1b5102aa199c1c3659d6f62129bd95fdd36f90b9 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type unknown int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller12.phar.php/a.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 3dcfd918a4111a688988418c77864b257002dbe6..5fc4b834e083f165d0832c8662bb55869d5196ea 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type not string/int zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller13.phar.php/a.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 27745f0ed1944de2b8ae217d715b9b1b03cf9ae2..7a3aaa57b2e2278fc6bf405eec642b5b66e0945b 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller14.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller14.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type override, other zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller14.phar.php/a.jpg
 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 2ed9deba0caa04da1c8e0b03df254010604ea5e0..33ac6739cd26619538a6063c8c8706ffb4c7a59f 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type override, Phar::PHPS zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller15.phar.php/a.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 a877ab051a2ee72f0f8387fbec7fe1c901008ccf..924996b00b639b4263e38e7c35ade54b8a68ac74 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type override, Phar::PHP zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller16.phar.php/a.phps
 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 0dac7a763d631eeca69a874cbd606073a774eb62..36054b8971c8b209728735f09911a85740fc5794 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller mime type unknown zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller17.phar.php/fronk.gronk
 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 4ff8693404101af9e76248871a7107e0668132ce..8d9139820eb0267a2d1f20dd0107840c8db2493c 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller $_SERVER munging failure zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller18.phar.php/fronk.gronk
 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 09d99c579dbe78b875f940955f56bcfb186e2efe..8057448a6085a94e8b4f23cf5f9c340bd59f4b19 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller $_SERVER munging failure 2 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --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 0f3551712d6c028386e256698f5108d27414d32c..ac64424ecb118be97100ed4e52108f0e65510a45 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller2.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller2.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller PHP test zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller2.phar.php/a.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 1c97167fbb5826676b918a22adae04ce05fba153..4b5859b33dba496486298bb9d59a8ea1f653fd9d 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller $_SERVER munging failure 3 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --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 dfcc9f94966f4daf7a532d922f7220fc52f8cd76..0acdee13266299daaaff448fde34c104bc07a0a3 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller21.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller21.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller $_SERVER munging success zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller21.phar.php/index.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 1ede369995997468e0b7ab14048391290dd14740..c34f4de8def577c5dd853fd38c251c6fbe97fef0 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller3.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller3.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller phps zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller3.phar.php/a.phps
 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 826f9b332ae6da9c749f7706b4d2b97050c8f6da..0a6e39e2c021d1fe090956b719699d9c3b8d1626 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller4.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller4.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller index.php relocate (no /) zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --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 b02a6216eccf71a9b858617a3c83086d14dfe01a..1e69240a0abd2a46f3852578ac4c49db9f358e6f 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller5.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller5.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller index.php relocate zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --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 125e3bd6827dd2d68a8807d0ce7a4205b68ce6c3..4f3435be22217a157db0223574f4cdaa95e99b43 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller 404 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller6.phar.php/notfound.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 03b3c2e67702197998dd6bc2c02a28bbc66ec9c1..2ce206fc21c6760e3ad94513ce9812d5f6b91d30 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller7.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller7.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller alternate index file zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller7.phar.php/
 REQUEST_URI=/frontcontroller7.phar.php/

diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt
index 328879b0ea4b89050d0705a2cf1f1dd7cf5cc1b0..dd806b6cf0a3d18314b654efeb52e26401da8636 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller no index file 404 zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller8.phar.php/
 REQUEST_URI=/frontcontroller8.phar.php/

diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
index b687a54aa04e781125cc998b3e324f4009efc803..70dbaa05addbd135464f7b024200e0cb96e6c7fe 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -2,7 +2,6 @@
 Phar front controller rewrite array zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --ENV--
 SCRIPT_NAME=/frontcontroller9.phar.php/hi
 REQUEST_URI=/frontcontroller9.phar.php/hi

diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt
index 6e677e74518cc9ac3ad86f5a2fd7074880d42b74..a68f9897edc42bd20ca20395a5984595201a9770 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_existing.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (existing file) 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/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index e3eb75ccc42e82e74adb308e52e3c7e3d19a346f..ef0eedb33487aa0b6874f4855a8b579f5994568b 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (existing file) 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/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 308c74d34879caece50bb015e49b3ebd885e4cf3..a859aada7d620ff104d4900d2e3d854d2b1598e4 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (existing file) tar-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/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt
index e30ae54636ec4274fd1c97fe372a7b6fe4d702f1..9d6a3be63d11404a2624f7637832578b08093878 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_newfile.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (new file) 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/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index 854917eb4b1b8b6aaec86d7ad7b1d1800caa028b..247706dd7eb8e6549ecf20074ee8cf51caeb55fe 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (new file) 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/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index 01b5871511d4d55a1422d89faabc875e0c97af13..8833f9f009260a3948aa01cdd8c270358bc22c7d 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -2,7 +2,6 @@
 Phar: fopen a .phar for writing (new file) 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/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index 494df27748d14a4347f96a0ffe7262139fd032ba..66c01346348498aadac200d2b3efa73de8ce0286 100755 (executable)
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -2,7 +2,6 @@
 Phar::startBuffering()/setStub()/stopBuffering() zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 --FILE--

diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
index 8e1df2e173da3b5a1233f35f738d99cc85fe440b..fe402b6b455d82c478cdbd6a3da41b924086d845 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, 1 file passed in zip-based
 --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/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
index 0270f5fb67650f81005a7ad03113737726e4bcf3..450ada100ddb63f19e415a9d60c9805eed6e26cb 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, iterator returns non-string zip-based
 --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/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
index 220420d711191e1fd7b5246b51a09b00ddff3cee..2dfb04dbf0d630986d6e527fdca3665fb2413763 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, key is int zip-based
 --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/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
index b66775d826e055287c5efdec8f19a0245bed1a27..16ba6d61b93a93dab16dea4c26e00e6f98a604ba 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, file can't be opened zip-based
 --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/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
index 4cf9aff3ac4720b6a4385a1dc1dd402135ebf594..0222dc8b4f754da768f549aae1c761bdae348598 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, SplFileInfo as current zip-based
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 --FILE--

diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
index 78816ab390fcb153516f9871654e557a75954a14..0b5630754567722c81f8adc8a36781e4c777cb97 100644 (file)
--- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
@@ -2,7 +2,6 @@
 Phar::buildFromIterator() iterator, 1 file resource passed in
 --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/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt
index c853517624ed21ed3ac5223d1bfe98dbc1d2ccb9..7afcc3a56c805946d696db30ae6d4e33ec267fc2 100644 (file)
--- a/ext/phar/tests/zip/phar_magic.phpt
+++ b/ext/phar/tests/zip/phar_magic.phpt
@@ -2,7 +2,6 @@
 Phar: include/fopen magic zip-based
 --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/phar_setalias.phpt b/ext/phar/tests/zip/phar_setalias.phpt
index b4588af9d68c11d3b004c9ee858878482fe16280..ecd969a1ddd68ed1be85624226b11bc1a67e1fd5 100644 (file)
--- a/ext/phar/tests/zip/phar_setalias.phpt
+++ b/ext/phar/tests/zip/phar_setalias.phpt
@@ -2,7 +2,6 @@
 Phar::setAlias() zip-based
 --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/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt
index 0fc6430fd524d6e4f2a37c6b5d08e34928890967..89057931a5e5b18acc34754eb51d03b03ee9ee98 100644 (file)
--- a/ext/phar/tests/zip/phar_setalias2.phpt
+++ b/ext/phar/tests/zip/phar_setalias2.phpt
@@ -2,7 +2,6 @@
 Phar::setAlias() error zip-based
 --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/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt
index 6a1d3fc199b72be3e383f1215aaabb976d3e91f1..fce7a8342723ad7fa25e1a0f27f68a998b202499 100755 (executable)
--- a/ext/phar/tests/zip/phar_stub_error.phpt
+++ b/ext/phar/tests/zip/phar_stub_error.phpt
@@ -2,7 +2,6 @@
 Phar::setStub()/getStub() zip-based
 --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/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index b70fb5e14650c2e3063f5240ef0e30642ed0ec3f..b16bcb6ead542f3763a2e7e9f7ad2df581a06cad 100644 (file)
--- a/ext/phar/tests/zip/refcount1.phpt
+++ b/ext/phar/tests/zip/refcount1.phpt
@@ -4,7 +4,6 @@ Phar: test that refcounting avoids problems with deleting a file zip-based
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (version_compare(PHP_VERSION, "5.3", "<")) die("skip requires 5.3 or later"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/refcount1_5_2.phpt b/ext/phar/tests/zip/refcount1_5_2.phpt
index 5098ccd90e6f9007fd119c11503d705d01dd430e..4514dc6dc426c8575ed7d64687f617569dcf6428 100755 (executable)
--- a/ext/phar/tests/zip/refcount1_5_2.phpt
+++ b/ext/phar/tests/zip/refcount1_5_2.phpt
@@ -4,7 +4,6 @@ Phar: test that refcounting avoids problems with deleting a file zip-based
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?>
 <?php if (version_compare(PHP_VERSION, "5.2", ">")) die("skip requires 5.2 or earlier"); ?>
-<?php if (!extension_loaded("zip")) die("skip"); ?>
 --INI--
 phar.readonly=0
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt
index 9a97f266ac4469161606a8dcd24557a24ba834bf..7e6d3118da868677f047cb3a06295029dc861fca 100644 (file)
--- a/ext/phar/tests/zip/rename.phpt
+++ b/ext/phar/tests/zip/rename.phpt
@@ -2,7 +2,6 @@
 Phar: rename 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

diff --git a/ext/phar/tests/zip/test_works_without_zip.phpt b/ext/phar/tests/zip/test_works_without_zip.phpt
deleted file mode 100644 (file)
index cd7988c..0000000
--- a/ext/phar/tests/zip/test_works_without_zip.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Phar with zip disabled
---SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (extension_loaded("zip")) die("skip"); ?>
---FILE--
-<?php
-try {
-       $phar = new Phar(dirname(__FILE__) . '/frontcontroller.phar.zip');
-} catch (Exception $e) {
-       echo $e->getMessage() . "\n";
-}
-?>
-===DONE===
---EXPECTF--
-Cannot open phar file '%sfrontcontroller.phar.zip' with alias '(null)': phar zip error: cannot open zip-based phar "%sfrontcontroller.phar.zip", ext/zip is not enabled
-===DONE===