From: Greg Beaver <cellog@php.net>
Date: Tue, 22 Jan 2008 05:26:38 +0000 (+0000)
Subject: fix tests to match CVS
X-Git-Tag: RELEASE_2_0_0a1~817
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f51bf6118c2bb8fad9e290e721074ccdc929c3c3;p=php

fix tests to match CVS
---

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index 96d2368a7f..e99914a2ab 100644
--- a/ext/phar/config.w32
+++ b/ext/phar/config.w32
@@ -5,14 +5,13 @@ ARG_ENABLE("phar", "enable phar support", "no");
 
 if (PHP_PHAR != "no") {
 	EXTENSION("phar", "tar.c zip.c stream.c dirstream.c func_interceptors.c phar.c phar_object.c phar_path_check.c");
-	if (PHP_ZIP_SHARED) {
-		ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_ZIP ");
-	}
 	if (PHP_PHAR_SHARED) {
 		ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_PHAR ");
 	}
-	AC_DEFINE('HAVE_PHAR_ZIP', 1);
-	ADD_EXTENSION_DEP('phar', 'zip');
+	if (HAVE_ZIP) {
+		AC_DEFINE('HAVE_PHAR_ZIP', 1);
+		ADD_EXTENSION_DEP('phar', 'zip', true);
+	}
 	ADD_EXTENSION_DEP('phar', 'zlib', true);
 	ADD_EXTENSION_DEP('phar', 'bz2', true);
 	ADD_EXTENSION_DEP('phar', 'spl', true);
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 06c6977481..3eeecf735b 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3393,11 +3393,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
  */
 static zend_module_dep phar_deps[] = {
 #if HAVE_PHAR_ZIP
-# ifdef PHP_WIN32
-	ZEND_MOD_REQUIRED("zip")
-# else
 	ZEND_MOD_OPTIONAL("zip")
-# endif
 #endif
 	ZEND_MOD_OPTIONAL("zlib")
 	ZEND_MOD_OPTIONAL("bz2")
diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt
index 72881d6bfe..cde2124c05 100755
--- a/ext/phar/tests/metadata_write.phpt
+++ b/ext/phar/tests/metadata_write.phpt
@@ -4,6 +4,7 @@ Phar with meta-data (write)
 <?php if (!extension_loaded("phar")) die("skip");?>
 --INI--
 phar.require_hash=0
+phar.readonly=0
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index 402bfbcd2f..48f3e1b565 100644
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -25,7 +25,7 @@ include 'phar_test.inc';
 $phar = new Phar($fname);
 $phar->convertToTar(Phar::GZ);
 var_dump($phar->isTar());
-var_dump($phar->isCompressed() === 0);
+var_dump($phar->isCompressed());
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
@@ -41,7 +41,7 @@ __HALT_COMPILER();
 ?>
 --EXPECT--
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 bool(true)
 ===DONE===
diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 0f02ccb474..79b4b149ef 100644
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -2,6 +2,7 @@
 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/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt
index 30e7dd1426..f86fa046d1 100644
--- a/ext/phar/tests/phar_metadata_read.phpt
+++ b/ext/phar/tests/phar_metadata_read.phpt
@@ -3,6 +3,7 @@ Phar with phar-level meta-data (read)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip");?>
 --INI--
+phar.readonly=0
 phar.require_hash=0
 --FILE--
 <?php
diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt
index c9c2ea7087..593c2a0ad4 100644
--- a/ext/phar/tests/phar_metadata_write.phpt
+++ b/ext/phar/tests/phar_metadata_write.phpt
@@ -4,6 +4,7 @@ Phar with phar meta-data (write)
 <?php if (!extension_loaded("phar")) die("skip");?>
 --INI--
 phar.require_hash=0
+phar.readonly=0
 --FILE--
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index 6eb8dbdd4d..dedbdd8380 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -20,7 +20,7 @@ $phar['a'] = 'hi there';
 $phar = new Phar($fname);
 $phar->convertToPhar(Phar::GZ);
 var_dump($phar->isPhar());
-var_dump($phar->isCompressed() === 0);
+var_dump($phar->isCompressed());
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
@@ -37,7 +37,7 @@ __HALT_COMPILER();
 --EXPECT--
 bool(true)
 bool(true)
-bool(true)
+bool(false)
 bool(true)
 bool(true)
 ===DONE===
diff --git a/ext/phar/tests/zip/test_works_without_zip.phpt b/ext/phar/tests/zip/test_works_without_zip.phpt
index 1446f35bb4..cd7988c793 100644
--- a/ext/phar/tests/zip/test_works_without_zip.phpt
+++ b/ext/phar/tests/zip/test_works_without_zip.phpt
@@ -6,12 +6,12 @@ Phar with zip disabled
 --FILE--
 <?php
 try {
-	$phar = new Phar(dirname(__FILE__) . '/frontcontroller1.phar.zip');
+	$phar = new Phar(dirname(__FILE__) . '/frontcontroller.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)
+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===