Fix more file name collisions in phar tests

diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt
index 3841d1dce39d5d5cfcb65a772b0b49cf64b9d169..aefbdb9c273d62e6824ea612f95b709b4d7c5b9e 100644 (file)
--- a/ext/phar/tests/tar/require_hash.phpt
+++ b/ext/phar/tests/tar/require_hash.phpt
@@ -9,9 +9,9 @@ phar.require_hash=0
 <?php
 ini_set('phar.require_hash', 1);
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
-$fname = dirname(__FILE__) . '/tar_004.phar.tar';
+$fname = dirname(__FILE__) . '/require_hash.phar.tar';
 $alias = 'phar://' . $fname;
-$fname2 = dirname(__FILE__) . '/tar_004.tar';
+$fname2 = dirname(__FILE__) . '/require_hash.tar';
 
 $tar = new tarmaker($fname, 'none');
 $tar->init();
@@ -41,11 +41,11 @@ try {
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
-@unlink(dirname(__FILE__) . '/tar_004.tar');
+@unlink(dirname(__FILE__) . '/require_hash.phar.tar');
+@unlink(dirname(__FILE__) . '/require_hash.tar');
 ?>
 --EXPECTF--
-tar-based phar "%star_004.phar.tar" does not have a signature
+tar-based phar "%srequire_hash.phar.tar" does not have a signature
 bool(false)
 array(2) {
   ["hash"]=>

diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index 210f8815ec1a52e745f7071d1ff1ce37aa34bf28..8f91c74d59d682211c50dd0fe42819bf65d029aa 100644 (file)
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -8,9 +8,9 @@ phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
-$fname = dirname(__FILE__) . '/tar_004.phar.tar';
+$fname = dirname(__FILE__) . '/tar_nostub.phar.tar';
 $alias = 'phar://' . $fname;
-$fname2 = dirname(__FILE__) . '/tar_004.tar';
+$fname2 = dirname(__FILE__) . '/tar_nostub.tar';
 
 $tar = new tarmaker($fname, 'none');
 $tar->init();
@@ -38,11 +38,11 @@ try {
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
-@unlink(dirname(__FILE__) . '/tar_004.tar');
+@unlink(dirname(__FILE__) . '/tar_nostub.phar.tar');
+@unlink(dirname(__FILE__) . '/tar_nostub.tar');
 ?>
 --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
+RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): failed to open dir: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
+phar url "phar://%star_nostub.phar.tar/" is unknown
 string(0) ""
 ===DONE===