Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 25214adbb099 · 2024-11-06T10:25:01.000+01:00
* 5.4:
  [Process] Fix test
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -123,7 +123,7 @@ public function testFindBatchExecutableOnWindows()
             $this->markTestSkipped('Can be only tested on windows');
         }
 
-        $target = tempnam(sys_get_temp_dir(), 'example-windows-executable');
+        $target = str_replace('.tmp', '_tmp', tempnam(sys_get_temp_dir(), 'example-windows-executable'));
 
         try {
             touch($target);

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function testFindBatchExecutableOnWindows()`
`123`	`123`	`$this->markTestSkipped('Can be only tested on windows');`
`124`	`124`	`}`
`125`	`125`
`126`		`- $target = tempnam(sys_get_temp_dir(), 'example-windows-executable');`
	`126`	`+ $target = str_replace('.tmp', '_tmp', tempnam(sys_get_temp_dir(), 'example-windows-executable'));`
`127`	`127`
`128`	`128`	`try {`
`129`	`129`	`touch($target);`