From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 16 Jul 2019 08:21:38 +0000 (+0200)
Subject: Canonicalize file-names in zip tests
X-Git-Tag: php-7.4.0beta1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e3ddac7dac1e8e9447f95342352c5b13867a77;p=php

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 0baf4c832e..13d8a6d388 100644
--- 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 efaa354ecf..4ad424ce19 100644
--- 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 271642b6dd..254f2b7620 100644
--- 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 cdf3ded336..385b943893 100644
--- 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 53ca490e7d..91793b2d1d 100644
--- 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 639ee6803e..714346aba4 100644
--- 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 518fe35706..cdac489084 100644
--- 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 b22c2a27a8..a4e10bfce5 100644
--- 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 f19600a4ed..0cdcd791b8 100644
--- 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 71647689ab..04634db03e 100644
--- 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 c29ef2ca88..8e3ef64396 100644
--- 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"