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

Ilija Tovilo <[email protected]>
Newsgroups gmane.comp.php.cvs.general
Message-ID <[email protected]> 
Author: Ilija Tovilo (iluuu1994)
Date: 2026-08-10T23:12:35+02:00

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

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix test file conflict

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


Diff:

diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt
index d1a697c4abb4..85e43868ce05 100644
--- a/ext/standard/tests/file/touch_variation6-win32.phpt
+++ b/ext/standard/tests/file/touch_variation6-win32.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 ?>
 --FILE--
 <?php
-$workDir = "touchVar5.tmp";
+$workDir = "touchVar6.tmp";
 $subDirOrFile = "aSubDirOrFile";
 chdir(__DIR__);
 mkdir($workDir);
@@ -154,80 +154,80 @@ function get_atime($path) {
 *** Testing touch() : variation ***
 
 *** testing nonexisting paths ***
---- testing touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\aSubDirOrFile - created
---- testing .\touchVar5.tmp\aSubDirOrFile ---
-PASSED: .\touchVar5.tmp\aSubDirOrFile - created
---- testing touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created
---- testing touchVar5.tmp\..\BADDIR\aSubDirOrFile ---
-
-Warning: touch(): Unable to create file touchVar5.tmp\..\BADDIR\aSubDirOrFile because %s in %s on line %d
+--- testing touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\aSubDirOrFile - created
+--- testing .\touchVar6.tmp\aSubDirOrFile ---
+PASSED: .\touchVar6.tmp\aSubDirOrFile - created
+--- testing touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - created
+--- testing touchVar6.tmp\..\BADDIR\aSubDirOrFile ---
+
+Warning: touch(): Unable to create file touchVar6.tmp\..\BADDIR\aSubDirOrFile because %s in %s on line %d
 --- testing BADDIR\aSubDirOrFile ---
 
 Warning: touch(): Unable to create file BADDIR\aSubDirOrFile because %s in %s on line %d
---- testing %s\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\aSubDirOrFile - created
---- testing %s\.\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\.\touchVar5.tmp\aSubDirOrFile - created
---- testing %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created
+--- testing %s\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\aSubDirOrFile - created
+--- testing %s\.\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\.\touchVar6.tmp\aSubDirOrFile - created
+--- testing %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - created
 --- testing %s\BADDIR\aSubDirOrFile ---
 
 Warning: touch(): Unable to create file %s\BADDIR\aSubDirOrFile because %s in %s on line %d
---- testing touchVar5.tmp\aSubDirOrFile\ ---
+--- testing touchVar6.tmp\aSubDirOrFile\ ---
 
-Warning: touch(): Unable to create file touchVar5.tmp\aSubDirOrFile\ because %s in %s on line %d
---- testing %s\touchVar5.tmp\aSubDirOrFile\ ---
+Warning: touch(): Unable to create file touchVar6.tmp\aSubDirOrFile\ because %s in %s on line %d
+--- testing %s\touchVar6.tmp\aSubDirOrFile\ ---
 
-Warning: touch(): Unable to create file %s\touchVar5.tmp\aSubDirOrFile\ because %s in %s on line %d
---- testing touchVar5.tmp\\aSubDirOrFile ---
-PASSED: touchVar5.tmp\\aSubDirOrFile - created
---- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
-PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - created
---- testing /%s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: /%s/touchVar5.tmp/aSubDirOrFile - created
+Warning: touch(): Unable to create file %s\touchVar6.tmp\aSubDirOrFile\ because %s in %s on line %d
+--- testing touchVar6.tmp\\aSubDirOrFile ---
+PASSED: touchVar6.tmp\\aSubDirOrFile - created
+--- testing %s\\touchVar6.tmp\\aSubDirOrFile ---
+PASSED: %s\\touchVar6.tmp\\aSubDirOrFile - created
+--- testing /%s/touchVar6.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar6.tmp/aSubDirOrFile - created
 
 *** testing existing files ***
---- testing touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\aSubDirOrFile - touched
---- testing .\touchVar5.tmp\aSubDirOrFile ---
-PASSED: .\touchVar5.tmp\aSubDirOrFile - touched
---- testing touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\.\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\.\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - touched
---- testing touchVar5.tmp\\aSubDirOrFile ---
-PASSED: touchVar5.tmp\\aSubDirOrFile - touched
---- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
-PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched
---- testing /%s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched
+--- testing touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\aSubDirOrFile - touched
+--- testing .\touchVar6.tmp\aSubDirOrFile ---
+PASSED: .\touchVar6.tmp\aSubDirOrFile - touched
+--- testing touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\.\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\.\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - touched
+--- testing touchVar6.tmp\\aSubDirOrFile ---
+PASSED: touchVar6.tmp\\aSubDirOrFile - touched
+--- testing %s\\touchVar6.tmp\\aSubDirOrFile ---
+PASSED: %s\\touchVar6.tmp\\aSubDirOrFile - touched
+--- testing /%s/touchVar6.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar6.tmp/aSubDirOrFile - touched
 
 *** testing existing directories ***
---- testing touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\aSubDirOrFile - touched
---- testing .\touchVar5.tmp\aSubDirOrFile ---
-PASSED: .\touchVar5.tmp\aSubDirOrFile - touched
---- testing touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\.\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\.\touchVar5.tmp\aSubDirOrFile - touched
---- testing %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile ---
-PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - touched
---- testing touchVar5.tmp\aSubDirOrFile\ ---
-PASSED: touchVar5.tmp\aSubDirOrFile\ - touched
---- testing %s\touchVar5.tmp\aSubDirOrFile\ ---
-PASSED: %s\touchVar5.tmp\aSubDirOrFile\ - touched
---- testing touchVar5.tmp\\aSubDirOrFile ---
-PASSED: touchVar5.tmp\\aSubDirOrFile - touched
---- testing %s\\touchVar5.tmp\\aSubDirOrFile ---
-PASSED: %s\\touchVar5.tmp\\aSubDirOrFile - touched
---- testing /%s/touchVar5.tmp/aSubDirOrFile ---
-PASSED: /%s/touchVar5.tmp/aSubDirOrFile - touched
+--- testing touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\aSubDirOrFile - touched
+--- testing .\touchVar6.tmp\aSubDirOrFile ---
+PASSED: .\touchVar6.tmp\aSubDirOrFile - touched
+--- testing touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\.\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\.\touchVar6.tmp\aSubDirOrFile - touched
+--- testing %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile ---
+PASSED: %s\touchVar6.tmp\..\touchVar6.tmp\aSubDirOrFile - touched
+--- testing touchVar6.tmp\aSubDirOrFile\ ---
+PASSED: touchVar6.tmp\aSubDirOrFile\ - touched
+--- testing %s\touchVar6.tmp\aSubDirOrFile\ ---
+PASSED: %s\touchVar6.tmp\aSubDirOrFile\ - touched
+--- testing touchVar6.tmp\\aSubDirOrFile ---
+PASSED: touchVar6.tmp\\aSubDirOrFile - touched
+--- testing %s\\touchVar6.tmp\\aSubDirOrFile ---
+PASSED: %s\\touchVar6.tmp\\aSubDirOrFile - touched
+--- testing /%s/touchVar6.tmp/aSubDirOrFile ---
+PASSED: /%s/touchVar6.tmp/aSubDirOrFile - touched
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.