summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteph Fox <sfox@php.net>2008-01-28 16:31:56 +0000
committerSteph Fox <sfox@php.net>2008-01-28 16:31:56 +0000
commit975a1b87af590f16154e94e301bc365911050b9b (patch)
treec25787be2f7f7937a9d94368ea7b64b56557fae8
parent352c3a7f1b44da70c01224cd062617318fa53e05 (diff)
downloadphp-git-975a1b87af590f16154e94e301bc365911050b9b.tar.gz
Get rid of zip requirement
-rw-r--r--ext/phar/tests/zip/frontcontroller1.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller10.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller11.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller12.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller13.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller14.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller15.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller16.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller17.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller18.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller19.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller2.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller20.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller21.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller3.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller4.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller5.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller6.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller7.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller8.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller9.phar.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_existing.phpt1
-rwxr-xr-xext/phar/tests/zip/open_for_write_existing_b.phpt1
-rwxr-xr-xext/phar/tests/zip/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile.phpt1
-rwxr-xr-xext/phar/tests/zip/open_for_write_newfile_b.phpt1
-rwxr-xr-xext/phar/tests/zip/open_for_write_newfile_c.phpt1
-rwxr-xr-xext/phar/tests/zip/phar_begin_setstub_commit.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator4.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator5.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator6.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator7.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator8.phpt1
-rw-r--r--ext/phar/tests/zip/phar_buildfromiterator9.phpt1
-rw-r--r--ext/phar/tests/zip/phar_magic.phpt1
-rw-r--r--ext/phar/tests/zip/phar_setalias.phpt1
-rw-r--r--ext/phar/tests/zip/phar_setalias2.phpt1
-rwxr-xr-xext/phar/tests/zip/phar_stub_error.phpt1
-rw-r--r--ext/phar/tests/zip/refcount1.phpt1
-rwxr-xr-xext/phar/tests/zip/refcount1_5_2.phpt1
-rw-r--r--ext/phar/tests/zip/rename.phpt1
-rw-r--r--ext/phar/tests/zip/test_works_without_zip.phpt17
42 files changed, 0 insertions, 58 deletions
diff --git a/ext/phar/tests/zip/frontcontroller1.phar.phpt b/ext/phar/tests/zip/frontcontroller1.phar.phpt
index 0a48fdbf50..2be7ab478c 100644
--- 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 42c938c411..025becd670 100644
--- 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 9b0dbe5d52..789138f329 100644
--- 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 95c564147e..1b5102aa19 100644
--- 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 3dcfd918a4..5fc4b834e0 100644
--- 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 27745f0ed1..7a3aaa57b2 100644
--- 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 2ed9deba0c..33ac6739cd 100644
--- 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 a877ab051a..924996b00b 100644
--- 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 0dac7a763d..36054b8971 100644
--- 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 4ff8693404..8d9139820e 100644
--- 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 09d99c579d..8057448a60 100644
--- 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 0f3551712d..ac64424ecb 100644
--- 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 1c97167fbb..4b5859b33d 100644
--- 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 dfcc9f9496..0acdee1326 100644
--- 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 1ede369995..c34f4de8de 100644
--- 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 826f9b332a..0a6e39e2c0 100644
--- 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 b02a6216ec..1e69240a0a 100644
--- 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 125e3bd682..4f3435be22 100644
--- 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 03b3c2e677..2ce206fc21 100644
--- 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 328879b0ea..dd806b6cf0 100644
--- 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 b687a54aa0..70dbaa05ad 100644
--- 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 6e677e7451..a68f9897ed 100644
--- 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 e3eb75ccc4..ef0eedb334 100755
--- 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 308c74d348..a859aada7d 100755
--- 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 e30ae54636..9d6a3be63d 100644
--- 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 854917eb4b..247706dd7e 100755
--- 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 01b5871511..8833f9f009 100755
--- 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 494df27748..66c0134634 100755
--- 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 8e1df2e173..fe402b6b45 100644
--- 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 0270f5fb67..450ada100d 100644
--- 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 220420d711..2dfb04dbf0 100644
--- 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 b66775d826..16ba6d61b9 100644
--- 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 4cf9aff3ac..0222dc8b4f 100644
--- 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 78816ab390..0b56307545 100644
--- 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 c853517624..7afcc3a56c 100644
--- 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 b4588af9d6..ecd969a1dd 100644
--- 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 0fc6430fd5..89057931a5 100644
--- 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 6a1d3fc199..fce7a83427 100755
--- 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 b70fb5e146..b16bcb6ead 100644
--- 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 5098ccd90e..4514dc6dc4 100755
--- 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 9a97f266ac..7e6d3118da 100644
--- 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
index cd7988c793..0000000000
--- 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===