From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 2 Jul 2020 13:36:43 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f12d9da5c68ef19890e7fb472b8e3e965bc77c6;p=php

Merge branch 'PHP-7.4'

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

1f12d9da5c68ef19890e7fb472b8e3e965bc77c6
diff --cc ext/standard/tests/file/lstat_stat_error.phpt
index a28e9d8675,fe0c8a978b..d2e4518f73
--- a/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 6691617c89,c6054f8f94..9776cdea4d
--- a/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_variation14.phpt
index c6a5971df3,67d64b79a1..9da7e65875
--- a/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_variation18.phpt
index ddc256b771,56fe90d16f..9dc5af56c5
--- a/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 27307025d9,122b4062bb..5f86d06ea5
--- a/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 e708ed477a,8bf7dc1959..efc03096a7
--- a/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 58efb30bfe,c6c2e3e6ae..e7a334a7cd
--- a/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_variation7.phpt
index 223e8f9b94,f3aaec2275..fab011dd20
--- a/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";