Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable most lstat_stat_* tests on Windows

diff --cc ext/standard/tests/file/lstat_stat_error.phpt
index a28e9d8675b7a1d5c947f80bd27ce0051cb9eca7,fe0c8a978b5f1405e8588f748d2f1155c4de9923..d2e4518f73a1947638f26e7a8716533b724c33ae
--- 1/ext/standard/tests/file/lstat_stat_error.phpt
--- 2/ext/standard/tests/file/lstat_stat_error.phpt
+++ b/ext/standard/tests/file/lstat_stat_error.phpt
@@@ -1,19 -1,27 +1,13 @@@
  --TEST--
  Test lstat() and stat() functions: error conditions
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. lstat() not available on Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  echo "*** Testing lstat() for error conditions ***\n";
  $file_path = __DIR__;
 -var_dump( lstat() );  // args < expected
 -var_dump( lstat(__FILE__, 2) );  // args > expected
  var_dump( lstat("$file_path/temp.tmp") ); // non existing file
  var_dump( lstat(22) ); // scalar argument
 -$arr = array(__FILE__);
 -var_dump( lstat($arr) ); // array argument
  
  echo "\n*** Testing stat() for error conditions ***\n";
 -var_dump( stat() );  // args < expected
 -var_dump( stat(__FILE__, 2) );  // file, args > expected
 -var_dump( stat(__DIR__, 2) );  //dir, args > expected
  
  var_dump( stat("$file_path/temp.tmp") ); // non existing file
  var_dump( stat("$file_path/temp/") ); // non existing dir

diff --cc ext/standard/tests/file/lstat_stat_variation1.phpt
index 6691617c89e4d437b5e880e68f028e875c3a5b18,c6054f8f941874065366e2deeb9b8b04a5427140..9776cdea4d42a0cc400c677ae1844ba8089a221a
--- 1/ext/standard/tests/file/lstat_stat_variation1.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation1.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation1.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - effects of rename() on file
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. Not valid for Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test the effects of rename() on stats of file */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation10.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation11.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation12.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation13.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation14.phpt
index c6a5971df3196f7f0c6d730bfcdb988e7cb6bd12,67d64b79a1ce895eab7343633f188736e9b58cf8..9da7e658754183c41634e44538ce2a32751dfcb9
--- 1/ext/standard/tests/file/lstat_stat_variation14.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation14.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation14.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - hardlink
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip.. lstat() not available on Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test the effects of is_link() on stats of hard link */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation15.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation18.phpt
index ddc256b771c06f7e19e77845b77f005a6718838a,56fe90d16f6ab2eee6b175a1269b0ace3bd579c3..9dc5af56c5a0e552d165c02c27951ebab2d2b6b1
--- 1/ext/standard/tests/file/lstat_stat_variation18.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation18.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation18.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - dir/file name stored in object
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. Not valid for Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test for stats of dir/file when their names are stored in objects */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation19.phpt
index 27307025d95242da419206c5073a2e8160fe5275,122b4062bb3be422171d2fb571980c4fae6e8a4c..5f86d06ea5cacdf4af0c70ad211bcbf171404182
--- 1/ext/standard/tests/file/lstat_stat_variation19.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation19.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation19.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - dir/file names in array
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. Not valid for Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test for stats of dir/file when their names are stored in an array */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation2.phpt
index e708ed477abc0c1d2badebd680d5128db6c035ce,8bf7dc19592248110d179bdce2c4fcba3cad3049..efc03096a7bd619ce1e1eaff503008159271abd3
--- 1/ext/standard/tests/file/lstat_stat_variation2.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation2.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation2.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - effects of rename() on dir
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. Not valid for Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test the effects of rename() on stats of dir */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation20.phpt
index 58efb30bfe56ad0a886abdbae9793b94ca152f20,c6c2e3e6ae80040571dcadbaff65a222172af58a..e7a334a7cd20544fb74de8595f52f982c6a2a544
--- 1/ext/standard/tests/file/lstat_stat_variation20.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation20.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation20.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - link names stored in array/object
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. lstat() not available on Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  /* test for stats of link when their names are stored in object and array */
  
  $file_path = __DIR__;

diff --cc ext/standard/tests/file/lstat_stat_variation22.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation3.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation4.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation6.phpt
Simple merge

diff --cc ext/standard/tests/file/lstat_stat_variation7.phpt
index 223e8f9b9475fec68bf776a3f834dde7febb05e8,f3aaec22752cc9ba06f5cdc9a3641813c4b59cbe..fab011dd20ad5bf714174a0544a13ebe56ba6b56
--- 1/ext/standard/tests/file/lstat_stat_variation7.phpt
--- 2/ext/standard/tests/file/lstat_stat_variation7.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation7.phpt
@@@ -1,13 -1,14 +1,7 @@@
  --TEST--
  Test lstat() and stat() functions: usage variations - writing data into file
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip.. Not valid for Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: array lstat ( string $filename );
 -   Description: Gives information about a file or symbolic link
 -
 -   Prototype: array stat ( string $filename );
 -   Description: Gives information about a file
 -*/
 -
  $file_path = __DIR__;
  require "$file_path/file.inc";