[php-src] master: Merge branch 'PHP-8.5'

Author: Shivam Mathur (shivammathur)
Date: 2026-08-12T15:59:36+05:30

Commit: https://github.com/php/php-src/commit/8bb923eb299c51f2453d35f9fecfcf2fb83ee8c3
Raw diff: https://github.com/php/php-src/commit/8bb923eb299c51f2453d35f9fecfcf2fb83ee8c3.diff

Merge branch 'PHP-8.5'

* PHP-8.5:
  Fix test file conflict on Windows (#23226)

Changed paths:
  M  ext/standard/tests/file/file_get_contents_variation7-win32.phpt


Diff:

diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
index 0cf7cc7d5aac..aecdb3238c10 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
@@ -10,8 +10,8 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 echo "*** Testing file_get_contents() : variation ***\n";
-$mainDir = "fileGetContentsVar7.dir";
-$subDir = "fileGetContentsVar7Sub";
+$mainDir = "fileGetContentsVar7Win32.dir";
+$subDir = "fileGetContentsVar7Win32Sub";
 $absMainDir = __DIR__."\\".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."\\".$subDir;
@@ -41,7 +41,7 @@ $allDirs = array(
   $unixifiedDir,
 );
 
-$filename = 'FileGetContentsVar7.tmp';
+$filename = 'FileGetContentsVar7Win32.tmp';
 $absFile = $absSubDir.'/'.$filename;
 $h = fopen($absFile,"w");
 fwrite($h, "contents read");
@@ -60,11 +60,11 @@ echo "\n*** Done ***\n";
 ?>
 --CLEAN--
 <?php
-$mainDir = "fileGetContentsVar7.dir";
-$subDir = "fileGetContentsVar7Sub";
+$mainDir = "fileGetContentsVar7Win32.dir";
+$subDir = "fileGetContentsVar7Win32Sub";
 $absMainDir = __DIR__."/".$mainDir;
 $absSubDir = $absMainDir."/".$subDir;
-$filename = 'FileGetContentsVar7.tmp';
+$filename = 'FileGetContentsVar7Win32.tmp';
 $absFile = $absSubDir.'/'.$filename;
 unlink($absFile);
 rmdir($absSubDir);