Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix skip reasons

10 files changed, 9 insertions, 12 deletions

diff --git a/ext/standard/tests/file/001.phpt b/ext/standard/tests/file/001.phpt
index e2fa6cce59..8fe6946d72 100644
--- a/ext/standard/tests/file/001.phpt
+++ b/ext/standard/tests/file/001.phpt
@@ -3,7 +3,7 @@ File type functions
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
diff --git a/ext/standard/tests/file/bug39367.phpt b/ext/standard/tests/file/bug39367.phpt
index f3e79fcf5e..3535250329 100644
--- a/ext/standard/tests/file/bug39367.phpt
+++ b/ext/standard/tests/file/bug39367.phpt
@@ -3,7 +3,7 @@ Bug #39367 (clearstatcache() doesn't clear realpath cache)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt
index 35eb8e80e1..c13eeb0ccf 100644
--- a/ext/standard/tests/file/fflush_variation2.phpt
+++ b/ext/standard/tests/file/fflush_variation2.phpt
@@ -3,7 +3,7 @@ Test fflush() function: usage variations - links as resource
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == 'WIN')
-  die("skip Links not valid on Windows");
+  die("skip not for Windows");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt
index 479005a00c..53a9f661b1 100644
--- a/ext/standard/tests/file/fflush_variation3.phpt
+++ b/ext/standard/tests/file/fflush_variation3.phpt
@@ -3,7 +3,7 @@ Test fflush() function: usage variations - hard links as resource
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == 'WIN')
-  die("skip Links not valid on Windows");
+  die("skip not for Windows");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt
index 0f93429548..4394507868 100644
--- a/ext/standard/tests/file/filetype_variation.phpt
+++ b/ext/standard/tests/file/filetype_variation.phpt
@@ -2,9 +2,6 @@
 Test filetype() function: Variations
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no link()/symlink() on Windows');
-}
 if (!function_exists("posix_mkfifo")) {
     die("skip no posix_mkfifo()");
 }
diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt
index 537dabbbcd..3d5e56b412 100644
--- a/ext/standard/tests/file/lstat_stat_basic.phpt
+++ b/ext/standard/tests/file/lstat_stat_basic.phpt
@@ -4,7 +4,7 @@ Test lstat() & stat() functions: basic functionality
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. lstat() not available on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt
index 2cc849f462..2953af8887 100644
--- a/ext/standard/tests/file/mkdir-002.phpt
+++ b/ext/standard/tests/file/mkdir-002.phpt
@@ -3,7 +3,7 @@ mkdir(dir, 0777) tests
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/realpath_basic4.phpt b/ext/standard/tests/file/realpath_basic4.phpt
index 1af510d34a..47fd8040c7 100644
--- a/ext/standard/tests/file/realpath_basic4.phpt
+++ b/ext/standard/tests/file/realpath_basic4.phpt
@@ -3,7 +3,7 @@ Test realpath() with relative paths
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt
index 3afbfe6411..f549cf6f07 100644
--- a/ext/standard/tests/file/symlink.phpt
+++ b/ext/standard/tests/file/symlink.phpt
@@ -3,7 +3,7 @@ symlink() & friends
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/symlink_to_symlink.phpt b/ext/standard/tests/file/symlink_to_symlink.phpt
index c13c26d827..3fcea5fde4 100644
--- a/ext/standard/tests/file/symlink_to_symlink.phpt
+++ b/ext/standard/tests/file/symlink_to_symlink.phpt
@@ -3,7 +3,7 @@ symlink() using a relative path, and symlink() to a symlink
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip no symlinks on Windows');
+    die('skip not for Windows');
 }
 ?>
 --FILE--