Merge branch 'PHP-7.4'

Author: nikic

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {