Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit 37f5c1fc0f83 · 2024-11-06T10:25:18.000+01:00
* 7.1:
  [Process] Fix test
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -148,7 +148,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
`@@ -148,7 +148,7 @@ public function testFindBatchExecutableOnWindows()`
`148`	`148`	`$this->markTestSkipped('Can be only tested on windows');`
`149`	`149`	`}`
`150`	`150`
`151`		`- $target = tempnam(sys_get_temp_dir(), 'example-windows-executable');`
	`151`	`+ $target = str_replace('.tmp', '_tmp', tempnam(sys_get_temp_dir(), 'example-windows-executable'));`
`152`	`152`
`153`	`153`	`try {`
`154`	`154`	`touch($target);`