From d6a77c992f18648af61716bafa2e1873c0284858 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 2 Oct 2019 11:33:52 +0200
Subject: [PATCH] Avoid file clash in root_check skipifs

---
 ext/standard/tests/file/is_executable_basic.phpt      | 2 +-
 ext/standard/tests/file/is_executable_variation2.phpt | 2 +-
 ext/standard/tests/file/is_readable_basic.phpt        | 2 +-
 ext/standard/tests/file/is_readable_variation1.phpt   | 2 +-
 ext/standard/tests/file/is_readable_variation2.phpt   | 2 +-
 ext/standard/tests/file/is_readable_variation3.phpt   | 2 +-
 ext/standard/tests/file/is_writable_basic.phpt        | 2 +-
 ext/standard/tests/file/is_writable_variation2.phpt   | 2 +-
 ext/standard/tests/file/lchown_error.phpt             | 2 +-
 ext/standard/tests/file/mkdir_rmdir_variation1.phpt   | 2 +-
 ext/standard/tests/file/mkdir_rmdir_variation2.phpt   | 2 +-
 ext/standard/tests/file/tempnam_variation4-0.phpt     | 2 +-
 ext/standard/tests/file/tempnam_variation4-1.phpt     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt
index a86b9e47614..ef2d2388cf3 100644
--- a/ext/standard/tests/file/is_executable_basic.phpt
+++ b/ext/standard/tests/file/is_executable_basic.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for windows');
 }
 // Skip if being run by root (files are always readable, writeable and executable)
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_executable_basic_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt
index 72957d147a7..935b5548f29 100644
--- a/ext/standard/tests/file/is_executable_variation2.phpt
+++ b/ext/standard/tests/file/is_executable_variation2.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for windows');
 }
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_executable_variation2_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_readable_basic.phpt b/ext/standard/tests/file/is_readable_basic.phpt
index ce5312862f1..5df3e36dddd 100644
--- a/ext/standard/tests/file/is_readable_basic.phpt
+++ b/ext/standard/tests/file/is_readable_basic.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for windows');
 }
 // Skip if being run by root (files are always readable, writeable and executable)
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_readable_basic_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt
index 66dc2b81f5f..c00c01cac79 100644
--- a/ext/standard/tests/file/is_readable_variation1.phpt
+++ b/ext/standard/tests/file/is_readable_variation1.phpt
@@ -4,7 +4,7 @@ Test is_readable() function: usage variations - diff. file notations
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
   // Skip if being run by root (files are always readable, writeable and executable)
-  $filename = __DIR__."/is_readable_root_check.tmp";
+  $filename = __DIR__."/is_readable_variation1_root_check.tmp";
   $fp = fopen($filename, 'w');
   fclose($fp);
   if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_readable_variation2.phpt b/ext/standard/tests/file/is_readable_variation2.phpt
index 896ef2e6183..dccee47c92a 100644
--- a/ext/standard/tests/file/is_readable_variation2.phpt
+++ b/ext/standard/tests/file/is_readable_variation2.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for windows');
 }
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_readable_variation2_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt
index 5aec51b7807..0821bfe4cd2 100644
--- a/ext/standard/tests/file/is_readable_variation3.phpt
+++ b/ext/standard/tests/file/is_readable_variation3.phpt
@@ -5,7 +5,7 @@ Test is_readable() function: usage variations - invalid file names
 if (substr(PHP_OS, 0, 3) != 'WIN') {
 
   // Skip if being run by root (files are always readable, writeable and executable)
-  $filename = __DIR__."/is_readable_root_check.tmp";
+  $filename = __DIR__."/is_readable_variation3_root_check.tmp";
   $fp = fopen($filename, 'w');
   fclose($fp);
   if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_writable_basic.phpt b/ext/standard/tests/file/is_writable_basic.phpt
index da2b2eb925d..ad0660bdfd9 100644
--- a/ext/standard/tests/file/is_writable_basic.phpt
+++ b/ext/standard/tests/file/is_writable_basic.phpt
@@ -3,7 +3,7 @@ Test is_writable() and its alias is_writeable() function: basic functionality
 --SKIPIF--
 <?php
 // Skip if being run by root (files are always readable, writeable and executable)
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_writable_basic_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/is_writable_variation2.phpt b/ext/standard/tests/file/is_writable_variation2.phpt
index a8cafb25bdc..eb75cf895f4 100644
--- a/ext/standard/tests/file/is_writable_variation2.phpt
+++ b/ext/standard/tests/file/is_writable_variation2.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. only on LINUX');
 }
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/is_writable_variation2_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index dc574bf421b..fd54b482b3b 100644
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -5,7 +5,7 @@ Test lchown() function : error functionality
 if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
 if (!function_exists("posix_getuid")) die("skip no posix_getuid()");
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/lchow_error_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt
index 21ad5619e15..94573646438 100644
--- a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. only on LINUX');
 }
 // Skip if being run by root (files are always readable, writeable and executable)
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/mkdir_rmdir_variation1_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
index b6a73953372..d9e041fa28f 100644
--- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. only on LINUX');
 }
 // Skip if being run by root (files are always readable, writeable and executable)
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/mkdir_rmdir_variation2_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt
index 4c3688a3486..4232ef0b085 100644
--- a/ext/standard/tests/file/tempnam_variation4-0.phpt
+++ b/ext/standard/tests/file/tempnam_variation4-0.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip Not valid for Windows');
 }
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/tempnam_variation4-0_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {
diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt
index 246608a3360..48d450d9222 100644
--- a/ext/standard/tests/file/tempnam_variation4-1.phpt
+++ b/ext/standard/tests/file/tempnam_variation4-1.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip Not valid for Windows');
 }
 // Skip if being run by root
-$filename = __DIR__."/is_readable_root_check.tmp";
+$filename = __DIR__."/tempnam_variation4-1_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
 if(fileowner($filename) == 0) {