fix tests to match CVS

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index 96d2368a7fe6b2a2fff24342a75203d6dd64b268..e99914a2ab877ccaef60c5ac8a38a9cffc41a435 100644 (file)
--- 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 06c69774816578145783e88e799c445ae68fe982..3eeecf735bdd21424f280b617b376caa9ef6980c 100644 (file)
--- 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 72881d6bfe9bc91ff3f680b842e8cb404f362555..cde2124c053da337657556cc79f49aa9209a4a79 100755 (executable)
--- 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 402bfbcd2fa18fbb932dfc9de459b35fa67dd940..48f3e1b56562a43146574cbab93a31c50b9a8a97 100644 (file)
--- 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 0f02ccb474391cd3293ca3451c0568a20b8a8a8e..79b4b149efc1f651be8e1eb825dc58377689ff36 100644 (file)
--- 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 30e7dd1426dec9d52ce62c17024e7a59f3f8b900..f86fa046d120781d9e2f57ec47526161b2812497 100644 (file)
--- 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 c9c2ea7087acb4a1882bb5fedca17dab0da9c8d3..593c2a0ad45389fc97d817901efb3d4ca7bdec1f 100644 (file)
--- 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 6eb8dbdd4dbe225502e86ca5d2d1fab69769f0c6..dedbdd8380e0090ccba37ed5edf80ffe37b1878d 100644 (file)
--- 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 1446f35bb4ce7fb6e98f0b14f31d54a375225730..cd7988c793ce3a4eb76d3ff31a653ea2abf24755 100644 (file)
--- 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===