Skip to content

Commit e2e3dda

Browse files
committed
Canonicalize file-names in zip tests
There were a number of name collisions in there.
1 parent 1d4c384 commit e2e3dda

11 files changed

+14
-14
lines changed

ext/zip/tests/bug64342_1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
99

1010
$dirname = __DIR__ . '/';
1111
include $dirname . 'utils.inc';
12-
$file = $dirname . '__tmp_oo_addfile.zip';
12+
$file = $dirname . 'bug64342_1.zip';
1313

1414
copy($dirname . 'test.zip', $file);
1515

ext/zip/tests/oo_addemptydir.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
99

1010
$dirname = __DIR__ . '/';
1111
include $dirname . 'utils.inc';
12-
$file = $dirname . '__tmp_oo_addfile.zip';
12+
$file = $dirname . 'oo_addemptydir.zip';
1313

1414
copy($dirname . 'test.zip', $file);
1515

ext/zip/tests/oo_addfile.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
99

1010
$dirname = __DIR__ . '/';
1111
include $dirname . 'utils.inc';
12-
$file = $dirname . '__tmp_oo_addfile.zip';
12+
$file = $dirname . 'oo_addfile.zip';
1313

1414
copy($dirname . 'test.zip', $file);
1515

ext/zip/tests/oo_delete.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(!extension_loaded('zip')) die('skip');
77
--FILE--
88
<?php
99
$dirname = __DIR__ . '/';
10-
$file = $dirname . '__tmp_oo_delete.zip';
10+
$file = $dirname . 'oo_delete.zip';
1111
if (file_exists($file)) {
1212
unlink($file);
1313
}

ext/zip/tests/oo_getnameindex.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
88
<?php
99
$dirname = __DIR__ . '/';
1010
include $dirname . 'utils.inc';
11-
$file = $dirname . '__tmp_oo_rename.zip';
11+
$file = $dirname . 'oo_getnameindex.zip';
1212

1313
@unlink($file);
1414

ext/zip/tests/oo_namelocate.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
88
<?php
99
$dirname = __DIR__ . '/';
1010
include $dirname . 'utils.inc';
11-
$file = $dirname . '__tmp_oo_rename.zip';
11+
$file = $dirname . 'oo_namelocate.zip';
1212

1313
@unlink($file);
1414

ext/zip/tests/oo_rename.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
88
<?php
99
$dirname = __DIR__ . '/';
1010
include $dirname . 'utils.inc';
11-
$file = $dirname . '__tmp_oo_rename.zip';
11+
$file = $dirname . 'oo_rename.zip';
1212

1313
@unlink($file);
1414

ext/zip/tests/oo_setcomment.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
88
<?php
99
$dirname = __DIR__ . '/';
1010
include $dirname . 'utils.inc';
11-
$file = $dirname . '__tmp_oo_set_comment.zip';
11+
$file = $dirname . 'oo_setcomment.zip';
1212

1313
@unlink($file);
1414

ext/zip/tests/oo_setcompression.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (!extension_loaded('zip')) die('skip');
66
?>
77
--FILE--
88
<?php
9-
$tmpfile = __DIR__ . '/__tmp_oo_set_compression.zip';
9+
$tmpfile = __DIR__ . '/oo_setcompression.zip';
1010

1111
if (file_exists($tmpfile)) {
1212
unlink($tmpfile);
@@ -52,7 +52,7 @@ zip_close($zip);
5252
?>
5353
--CLEAN--
5454
<?php
55-
$tmpfile = __DIR__ . '/__tmp_oo_set_compression.zip';
55+
$tmpfile = __DIR__ . '/oo_setcompression.zip';
5656
unlink($tmpfile);
5757
?>
5858
--EXPECT--

ext/zip/tests/oo_unchangeIndex.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PHP TestFest 2017 - Bergfreunde, Florian Engelhardt
77
--FILE--
88
<?php
99
$dirname = __DIR__ . '/';
10-
$file = $dirname . '__tmp_oo_unchangeIndex.zip';
10+
$file = $dirname . 'oo_unchangeIndex.zip';
1111
copy($dirname.'test.zip', $file);
1212

1313
var_dump(md5_file($file));
@@ -32,7 +32,7 @@ var_dump(md5_file($file));
3232
?>
3333
--CLEAN--
3434
<?php
35-
unlink(__DIR__.'/__tmp_oo_unchangeIndex.zip');
35+
unlink(__DIR__.'/oo_unchangeIndex.zip');
3636
?>
3737
--EXPECT--
3838
string(32) "cb753d0a812b2edb386bdcbc4cd7d131"

0 commit comments

Comments
 (0)