From: Greg Beaver <cellog@php.net>
Date: Thu, 17 Jan 2008 20:17:40 +0000 (+0000)
Subject: add new test for opening a zip-based phar with no zip ext, update skipif for phar_con... 
X-Git-Tag: RELEASE_2_0_0a1~860
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5689f3c9c686ee37ea18b3468c935f369d316391;p=php

add new test for opening a zip-based phar with no zip ext, update skipif for phar_convert test
---

diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index 337682e7d8..f0dede60c9 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -2,6 +2,7 @@
 Phar::convertToPhar() from zip
 --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/test_works_without_zip.phpt b/ext/phar/tests/zip/test_works_without_zip.phpt
new file mode 100644
index 0000000000..1446f35bb4
--- /dev/null
+++ b/ext/phar/tests/zip/test_works_without_zip.phpt
@@ -0,0 +1,17 @@
+--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__) . '/frontcontroller1.phar.zip');
+} catch (Exception $e) {
+	echo $e->getMessage() . "\n";
+}
+?>
+===DONE===
+--EXPECTF--
+Cannot open phar file '%sfrontcontroller1.phar.zip' with alias '(null)': phar zip error: phar "%sfrontcontroller1.phar.zip" cannot be created as zip-based phar, zip-based phars are disabled (enable ext/zip)
+===DONE===