Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable further ext/standard/tests/file tests on Windows

Author: cmb69

ext/standard/tests/file/fileinode_variation.phpt

@@ -2,8 +2,9 @@
 Test fileinode() function: Variations
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no link()/symlink() on Windows');
+if (PHP_OS_FAMILY === 'Windows') {
+    require_once __DIR__ . '/windows_links/common.inc';
+    skipIfSeCreateSymbolicLinkPrivilegeIsDisabled(__FILE__);
 }
 ?>
 --FILE--

ext/standard/tests/file/fopen_variation10-win32.phpt

@@ -7,7 +7,7 @@ Dave Kelsey <[email protected]>
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Run only on Windows");
 
-if (!is_writable('c:\\fopen_variation10.tmp')) {
+if (!is_writable('c:\\')) {
 	die('skip. C:\\ not writable.');
 }
 
@@ -95,14 +95,14 @@ Warning: fclose(): Argument #1 must be of type resource, bool given in %s on lin
 
 --\--
 
-Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d
+Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
 Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
 
 --/--
 
-Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d
+Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
 Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d

ext/standard/tests/file/fopen_variation11-win32.phpt

@@ -6,7 +6,7 @@ Dave Kelsey <[email protected]>
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Run only on Windows");
-if (!is_writable('c:\\fopen_variation10.tmp')) {
+if (!is_writable('c:\\')) {
 	die('skip. C:\\ not writable.');
 }
 
@@ -93,14 +93,14 @@ Warning: fclose(): Argument #1 must be of type resource, bool given in %s on lin
 
 --\--
 
-Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d
+Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
 Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d
 
 --/--
 
-Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d
+Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: No such file or directory in %s on line %d
 file not opened for read
 
 Warning: fclose(): Argument #1 must be of type resource, bool given in %s on line %d