update tests to ensure all temp files are erased, and to current error messages

diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index cc585d870f32e0783bd5c8864d3e7749f8f9dab7..ec012eaa113c6830e5dc171dedefbb619a131280 100644 (file)
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -22,4 +22,5 @@ $dir = opendir('phar://hio');
 --CLEAN--
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
-Warning: opendir(phar://hio): failed to open dir: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar) in %s on line %d
+Warning: opendir(phar://hio): failed to open dir: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar)
+phar url "phar://hio" is unknown in %s017.php on line %d
\ No newline at end of file

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index be28f4d52968175f30b54002e23c72dd5ca366c8..18b1a2594c3856c9e0ae34ead5453f439db950f5 100755 (executable)
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -84,7 +84,8 @@ int(0)
 bool(false)
 opendir edge cases
 
-Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %s027.php on line %d
+Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar)
+phar url "phar://" is unknown in %s027.php on line %d
 bool(false)
 
 Warning: opendir(phar://foo.phar/hi): failed to open dir: phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d

diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt
index 90379fa97abb41b747e8b23a89b083ef83153f96..e87019b6a18e24f1b7c491c0f3b4ba7a094c39f5 100644 (file)
--- a/ext/phar/tests/tar/tar_makebz2.phpt
+++ b/ext/phar/tests/tar/tar_makebz2.phpt
@@ -28,6 +28,7 @@ var_dump($phar2->isCompressed() == Phar::BZ2);
 ===DONE===
 --CLEAN--
 <?php
+@unlink(dirname(__FILE__) . '/tar_makebz2.phar.bz2');
 @unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar');
 @unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2');
 @unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2');

diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt
index 9e2206ecc106c799005a83fd921a4921d38fdd9d..ae38cfeb36792b8e9dd5ec68c563506044741c6f 100644 (file)
--- a/ext/phar/tests/tar/tar_makegz.phpt
+++ b/ext/phar/tests/tar/tar_makegz.phpt
@@ -29,6 +29,7 @@ var_dump($phar2->isCompressed() == Phar::GZ);
 ===DONE===
 --CLEAN--
 <?php
+@unlink(dirname(__FILE__) . '/tar_makegz.phar.gz');
 @unlink(dirname(__FILE__) . '/tar_makegz.phar.tar');
 @unlink(dirname(__FILE__) . '/tar_makegz.phar.tar.gz');
 @unlink(dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz');

diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index 33b5c5dfaa4a995cdd828f0f618bea9bdf425237..a107a37debf40fef7b588119bdb2aa36c8baba85 100644 (file)
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -43,5 +43,6 @@ try {
 ?>
 --EXPECTF--
 RecursiveDirectoryIterator::__construct(phar://%star_004.phar.tar/): failed to open dir: '%star_004.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
+phar url "phar://%star_004.phar.tar/" is unknown
 string(0) ""
 ===DONE===

diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt
index 5d1dbcbc4330edea34a8f506822dc961dbb9b0f6..34ca193566733d4a33d3c95dd33dc9289a89799b 100644 (file)
--- a/ext/phar/tests/zf_test.phpt
+++ b/ext/phar/tests/zf_test.phpt
@@ -36,6 +36,9 @@ foreach(new RecursiveIteratorIterator($phar) as $path) {
 --CLEAN--
 <?php
 unlink(dirname(__FILE__) . '/zfapp.phar');
+unlink(dirname(__FILE__) . '/zfapp.phar.tar.gz');
+unlink(dirname(__FILE__) . '/zfapp.phar.tar.php');
+unlink(dirname(__FILE__) . '/zfapp.phar.gz');
 ?>
 --EXPECTF--
 phar://%szfapp.phar.tar.gz/.phar/stub.php