Skip to content

Commit 27f24bd

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix test conflict between chmod_variation2 and file_variation5
2 parents 9eee4dd + 605ee05 commit 27f24bd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/standard/tests/file/chmod_variation2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ clearstatcache();
3434
printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK);
3535

3636
echo "\nchmod() on a linked file\n";
37-
$linkname = "somelink";
37+
$linkname = "somelink2";
3838
var_dump(symlink($filepath, $linkname));
3939
var_dump(chmod($filepath, 0777));
4040
var_dump(chmod($linkname, 0755));

ext/standard/tests/file/file_variation5.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo "\nfile() on a path containing .. with invalid directories\n";
2727
var_dump(file("./$test_dirname/bad_dir/../../$filename"));
2828

2929
echo "\nfile() on a linked file\n";
30-
$linkname = "somelink";
30+
$linkname = "somelink5";
3131
var_dump(symlink($filepath, $linkname));
3232
var_dump(file($linkname));
3333
var_dump(unlink($linkname));

0 commit comments

Comments
 (0)