Canonicalize file-names in zip tests

There were a number of name collisions in there.

diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt
index 0baf4c832efc33ba80832cbdc888ecba109ab079..13d8a6d38852538afa33e38269cc1ce06fdf38eb 100644 (file)
--- a/ext/zip/tests/bug64342_1.phpt
+++ b/ext/zip/tests/bug64342_1.phpt
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
 
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_addfile.zip';
+$file = $dirname . 'bug64342_1.zip';
 
 copy($dirname . 'test.zip', $file);
 

diff --git a/ext/zip/tests/oo_addemptydir.phpt b/ext/zip/tests/oo_addemptydir.phpt
index efaa354ecf99ca88b581375156f3574fdf120aba..4ad424ce19d75333ca2ca405e80d5bbf3cbc3575 100644 (file)
--- a/ext/zip/tests/oo_addemptydir.phpt
+++ b/ext/zip/tests/oo_addemptydir.phpt
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
 
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_addfile.zip';
+$file = $dirname . 'oo_addemptydir.zip';
 
 copy($dirname . 'test.zip', $file);
 

diff --git a/ext/zip/tests/oo_addfile.phpt b/ext/zip/tests/oo_addfile.phpt
index 271642b6dd12056e814cacadd92ba2526f7bc4b8..254f2b762073ac8cdedfd9f636e4340cd4814adf 100644 (file)
--- a/ext/zip/tests/oo_addfile.phpt
+++ b/ext/zip/tests/oo_addfile.phpt
@@ -9,7 +9,7 @@ if(!extension_loaded('zip')) die('skip');
 
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_addfile.zip';
+$file = $dirname . 'oo_addfile.zip';
 
 copy($dirname . 'test.zip', $file);
 

diff --git a/ext/zip/tests/oo_delete.phpt b/ext/zip/tests/oo_delete.phpt
index cdf3ded3364fe1741822e2073be2b9d6d940a84b..385b943893c151276f7a83490c2411a7f2702d0c 100644 (file)
--- a/ext/zip/tests/oo_delete.phpt
+++ b/ext/zip/tests/oo_delete.phpt
@@ -7,7 +7,7 @@ if(!extension_loaded('zip')) die('skip');
 --FILE--
 <?php
 $dirname = __DIR__ . '/';
-$file = $dirname . '__tmp_oo_delete.zip';
+$file = $dirname . 'oo_delete.zip';
 if (file_exists($file)) {
        unlink($file);
 }

diff --git a/ext/zip/tests/oo_getnameindex.phpt b/ext/zip/tests/oo_getnameindex.phpt
index 53ca490e7da90026abaa556f16971eb6933efca2..91793b2d1de07c704240393e04c27768edd0c939 100644 (file)
--- a/ext/zip/tests/oo_getnameindex.phpt
+++ b/ext/zip/tests/oo_getnameindex.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
 <?php
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_rename.zip';
+$file = $dirname . 'oo_getnameindex.zip';
 
 @unlink($file);
 

diff --git a/ext/zip/tests/oo_namelocate.phpt b/ext/zip/tests/oo_namelocate.phpt
index 639ee6803ea3e5d894198a9eee091d354cd671c5..714346aba40d3fee4e9a441971cad65af07b7a2a 100644 (file)
--- a/ext/zip/tests/oo_namelocate.phpt
+++ b/ext/zip/tests/oo_namelocate.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
 <?php
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_rename.zip';
+$file = $dirname . 'oo_namelocate.zip';
 
 @unlink($file);
 

diff --git a/ext/zip/tests/oo_rename.phpt b/ext/zip/tests/oo_rename.phpt
index 518fe35706532c5ad8bab6f4150d83438f382cb7..cdac4890848f01dfea27b21d3b4e26b52dbab749 100644 (file)
--- a/ext/zip/tests/oo_rename.phpt
+++ b/ext/zip/tests/oo_rename.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
 <?php
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_rename.zip';
+$file = $dirname . 'oo_rename.zip';
 
 @unlink($file);
 

diff --git a/ext/zip/tests/oo_setcomment.phpt b/ext/zip/tests/oo_setcomment.phpt
index b22c2a27a8666b30bcbe9e01095e36adae5b6fa1..a4e10bfce59216b1f242ad8347488379e56e0231 100644 (file)
--- a/ext/zip/tests/oo_setcomment.phpt
+++ b/ext/zip/tests/oo_setcomment.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('zip')) die('skip');
 <?php
 $dirname = __DIR__ . '/';
 include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_set_comment.zip';
+$file = $dirname . 'oo_setcomment.zip';
 
 @unlink($file);
 

diff --git a/ext/zip/tests/oo_setcompression.phpt b/ext/zip/tests/oo_setcompression.phpt
index f19600a4edb05f3a45c4cefdbdd9e921b5d04ef6..0cdcd791b8751c18a7261e9126e9d9b4602f0d0a 100644 (file)
--- a/ext/zip/tests/oo_setcompression.phpt
+++ b/ext/zip/tests/oo_setcompression.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('zip')) die('skip');
 ?>
 --FILE--
 <?php
-$tmpfile = __DIR__ . '/__tmp_oo_set_compression.zip';
+$tmpfile = __DIR__ . '/oo_setcompression.zip';
 
 if (file_exists($tmpfile)) {
        unlink($tmpfile);
@@ -52,7 +52,7 @@ zip_close($zip);
 ?>
 --CLEAN--
 <?php
-$tmpfile = __DIR__ . '/__tmp_oo_set_compression.zip';
+$tmpfile = __DIR__ . '/oo_setcompression.zip';
 unlink($tmpfile);
 ?>
 --EXPECT--

diff --git a/ext/zip/tests/oo_unchangeIndex.phpt b/ext/zip/tests/oo_unchangeIndex.phpt
index 71647689abb0471d289c06caecf863aac53415d9..04634db03e26b13436ae60d05512204fefa06b0a 100644 (file)
--- a/ext/zip/tests/oo_unchangeIndex.phpt
+++ b/ext/zip/tests/oo_unchangeIndex.phpt
@@ -7,7 +7,7 @@ PHP TestFest 2017 - Bergfreunde, Florian Engelhardt
 --FILE--
 <?php
 $dirname = __DIR__ . '/';
-$file = $dirname . '__tmp_oo_unchangeIndex.zip';
+$file = $dirname . 'oo_unchangeIndex.zip';
 copy($dirname.'test.zip', $file);
 
 var_dump(md5_file($file));
@@ -32,7 +32,7 @@ var_dump(md5_file($file));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__.'/__tmp_oo_unchangeIndex.zip');
+unlink(__DIR__.'/oo_unchangeIndex.zip');
 ?>
 --EXPECT--
 string(32) "cb753d0a812b2edb386bdcbc4cd7d131"

diff --git a/ext/zip/tests/oo_unchangeName.phpt b/ext/zip/tests/oo_unchangeName.phpt
index c29ef2ca8897223c03d6ba248e89f47506d4f1c2..8e3ef64396251ac5d8407692c19603038e325e54 100644 (file)
--- a/ext/zip/tests/oo_unchangeName.phpt
+++ b/ext/zip/tests/oo_unchangeName.phpt
@@ -7,7 +7,7 @@ PHP TestFest 2017 - Bergfreunde, Florian Engelhardt
 --FILE--
 <?php
 $dirname = __DIR__ . '/';
-$file = $dirname . '__tmp_oo_unchangeIndex.zip';
+$file = $dirname . 'oo_unchangeName.zip';
 copy($dirname.'test.zip', $file);
 
 var_dump(md5_file($file));
@@ -32,7 +32,7 @@ var_dump(md5_file($file));
 ?>
 --CLEAN--
 <?php
-unlink(__DIR__.'/__tmp_oo_unchangeIndex.zip');
+unlink(__DIR__.'/oo_unchangeName.zip');
 ?>
 --EXPECT--
 string(32) "cb753d0a812b2edb386bdcbc4cd7d131"