Skip to content

Commit e2cc0b8

Browse files
committed
Fix more file name collisions in phar tests
1 parent b6d8d9c commit e2cc0b8

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

ext/phar/tests/tar/require_hash.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ phar.require_hash=0
99
<?php
1010
ini_set('phar.require_hash', 1);
1111
include dirname(__FILE__) . '/files/tarmaker.php.inc';
12-
$fname = dirname(__FILE__) . '/tar_004.phar.tar';
12+
$fname = dirname(__FILE__) . '/require_hash.phar.tar';
1313
$alias = 'phar://' . $fname;
14-
$fname2 = dirname(__FILE__) . '/tar_004.tar';
14+
$fname2 = dirname(__FILE__) . '/require_hash.tar';
1515

1616
$tar = new tarmaker($fname, 'none');
1717
$tar->init();
@@ -41,11 +41,11 @@ try {
4141
===DONE===
4242
--CLEAN--
4343
<?php
44-
@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
45-
@unlink(dirname(__FILE__) . '/tar_004.tar');
44+
@unlink(dirname(__FILE__) . '/require_hash.phar.tar');
45+
@unlink(dirname(__FILE__) . '/require_hash.tar');
4646
?>
4747
--EXPECTF--
48-
tar-based phar "%star_004.phar.tar" does not have a signature
48+
tar-based phar "%srequire_hash.phar.tar" does not have a signature
4949
bool(false)
5050
array(2) {
5151
["hash"]=>

ext/phar/tests/tar/tar_nostub.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ phar.require_hash=0
88
--FILE--
99
<?php
1010
include dirname(__FILE__) . '/files/tarmaker.php.inc';
11-
$fname = dirname(__FILE__) . '/tar_004.phar.tar';
11+
$fname = dirname(__FILE__) . '/tar_nostub.phar.tar';
1212
$alias = 'phar://' . $fname;
13-
$fname2 = dirname(__FILE__) . '/tar_004.tar';
13+
$fname2 = dirname(__FILE__) . '/tar_nostub.tar';
1414

1515
$tar = new tarmaker($fname, 'none');
1616
$tar->init();
@@ -38,11 +38,11 @@ try {
3838
===DONE===
3939
--CLEAN--
4040
<?php
41-
@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
42-
@unlink(dirname(__FILE__) . '/tar_004.tar');
41+
@unlink(dirname(__FILE__) . '/tar_nostub.phar.tar');
42+
@unlink(dirname(__FILE__) . '/tar_nostub.tar');
4343
?>
4444
--EXPECTF--
45-
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
46-
phar url "phar://%star_004.phar.tar/" is unknown
45+
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
46+
phar url "phar://%star_nostub.phar.tar/" is unknown
4747
string(0) ""
4848
===DONE===

0 commit comments

Comments
 (0)