From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 10 Jul 2020 08:10:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdcda50304a2a0f3ae65b256507a8540594b69d7;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable symlink_link_linkinfo_is_link_* tests on Windows
---

bdcda50304a2a0f3ae65b256507a8540594b69d7
diff --cc ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt
index cde6783e15,2c3017628c..69715be008
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation2.phpt
@@@ -1,13 -1,20 +1,7 @@@
  --TEST--
  Test symlink(), linkinfo(), link() and is_link() functions : usage variations - hardlink to non-existent file
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip no symlinks on Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: bool symlink ( string $target, string $link );
 -   Description: creates a symbolic link to the existing target with the specified name link
 -
 -   Prototype: bool is_link ( string $filename );
 -   Description: Tells whether the given file is a symbolic link.
 -
 -   Prototype: bool link ( string $target, string $link );
 -   Description: Create a hard link
 -
 -   Prototype: int linkinfo ( string $path );
 -   Description: Gets information about a link
 -*/
 -
  /* Variation 2 : Create hard link to non-existent file */
  
  $file_path = __DIR__;
diff --cc ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
index 1bb3b76eaa,fa39a9bf6d..ff2a3f0f4a
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
@@@ -1,13 -1,20 +1,7 @@@
  --TEST--
  Test symlink(), linkinfo(), link() and is_link() functions : usage variations - access/update file through hard link
- --SKIPIF--
- <?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
-     die('skip no symlinks on Windows');
- }
- ?>
  --FILE--
  <?php
 -/* Prototype: bool symlink ( string $target, string $link );
 -   Description: creates a symbolic link to the existing target with the specified name link
 -
 -   Prototype: bool is_link ( string $filename );
 -   Description: Tells whether the given file is a symbolic link.
 -
 -   Prototype: bool link ( string $target, string $link );
 -   Description: Create a hard link
 -
 -   Prototype: int linkinfo ( string $path );
 -   Description: Gets information about a link
 -*/
 -
  /* Variation 4 : Create file and a hard link to the file
                   Access data of the file through the hard link
                   Update the file through hard link
diff --cc ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
index 0fd0b4838e,c5e1c4805f..baf8a402cd
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
@@@ -69,10 -83,14 +70,14 @@@ var_dump(is_int($linkinfo) && $linkinf
  if( $s1[0] == $linkinfo )
    echo "\nlinkinfo() value matches lstat['dev']\n";
  else
 -  echo "\nWarning: linkinfo() value doesnt match lstat['dev']\n";
 +  echo "\nWarning: linkinfo() value doesn't match lstat['dev']\n";
  
  // delete link
- unlink($soft_link);
+ if (PHP_OS_FAMILY === 'Windows') {
+   rmdir($soft_link);
+ } else {
+   unlink($soft_link);
+ }
  
  echo "Done\n";
  ?>