clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests to match CVS

Browse Source
This commit is contained in:
Greg Beaver 2008-01-22 05:26:38 +00:00
parent bc1475c65a
commit f51bf6118c
9 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/phar/config.w32
View File

@ -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);

4
ext/phar/phar.c
View File

@ -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")

1
ext/phar/tests/metadata_write.phpt
View File

@ -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';

4
ext/phar/tests/phar_convert_tar2.phpt
View File

@ -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===

1
ext/phar/tests/phar_convert_zip.phpt
View File

@ -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

1
ext/phar/tests/phar_metadata_read.phpt
View File

@ -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

1
ext/phar/tests/phar_metadata_write.phpt
View File

@ -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';

4
ext/phar/tests/tar/phar_convert_phar2.phpt
View File

@ -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===

4
ext/phar/tests/zip/test_works_without_zip.phpt
View File

@ -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===