- Fix a couple of failing tests/bad cleanup

@Greg: the phpinfo() ones assumed no php.ini - this isn't always the case, even if it should be

diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt
index 1606aa60fdab06498d1f45330b37b18543ee5676..f08bd6c606daa107a7535b91f68e5cd6ff38d585 100644 (file)
--- a/ext/phar/tests/phar_extract.phpt
+++ b/ext/phar/tests/phar_extract.phpt
@@ -105,7 +105,7 @@ $e = dirname(__FILE__) . '/extract2/';
 @rmdir($e);
 ?>
 --EXPECTF--
-%sextract/file1.txt
+%sextract%cfile1.txt
 %sextract%cfile2.txt
 %sextract%cone
 %sextract%csubdir
@@ -125,5 +125,5 @@ Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "file1.tx
 string(5) "first"
 string(2) "hi"
 Cannot extract to "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa...", destination directory is too long for filesystem
-Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." to "%sextract...", extracted filename is too long for filesystem
+Extraction from phar "%stempmanifest1.phar.php" failed: Cannot extract "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." to "%sextract%s...", extracted filename is too long for filesystem
 ===DONE===
\ No newline at end of file

diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt
index 061598eb07e5afcdb309fba025cd12bbf7aa864f..62d4700212c01d3b149df5c006cb15e0f1b752ba 100644 (file)
--- a/ext/phar/tests/phpinfo_002.phpt
+++ b/ext/phar/tests/phpinfo_002.phpt
@@ -5,6 +5,8 @@ Phar: phpinfo display 2
 <?php if (!extension_loaded("zlib")) die("skip zlib not loaded"); ?>
 <?php if (!extension_loaded("bz2")) die("skip bz2 not loaded"); ?>
 --INI--
+phar.readonly=1
+phar.require_hash=1
 --FILE--
 <?php
 phpinfo(INFO_MODULES);

diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt
index b26f9e61b73334ebefbc6d545ec7ceed14d19aa7..01c402ececa02ec9fda8973b9d17a63491a66d72 100644 (file)
--- a/ext/phar/tests/phpinfo_003.phpt
+++ b/ext/phar/tests/phpinfo_003.phpt
@@ -5,6 +5,8 @@ Phar: phpinfo display 3
 <?php if (extension_loaded("zlib")) die("skip zlib loaded"); ?>
 <?php if (extension_loaded("bz2")) die("skip bz2 loaded"); ?>
 --INI--
+phar.readonly=1
+phar.require_hash=1
 --FILE--
 <?php
 phpinfo(INFO_MODULES);

diff --git a/ext/phar/tests/zip/phar_setalias.phpt b/ext/phar/tests/zip/phar_setalias.phpt
index 19daa407dde5f41389281591163ce05da273751b..1a39633863942cf65471c69d8f7782e63401ff20 100644 (file)
--- a/ext/phar/tests/zip/phar_setalias.phpt
+++ b/ext/phar/tests/zip/phar_setalias.phpt
@@ -51,7 +51,7 @@ echo $p3->getAlias(), "\n";
 <?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip');
-unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.zip');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '3.phar.zip');
 __HALT_COMPILER();
 ?>
 --EXPECT--