Merge branch '10.5' into 11.0

sebastianbergmann · Mar 28, 2024 · 097d217 · 097d217
2 parents b7fda56 + 9f35e8a
commit 097d217
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/ChangeLog-11.0.md b/ChangeLog-11.0.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 11.0 release series are documented in this fi
 ### Changed
 
 * [#5766](https://github.com/sebastianbergmann/phpunit/pull/5766): Do not use a shell in `proc_open()` if not really needed
+* [#5772](https://github.com/sebastianbergmann/phpunit/pull/5772): Cleanup process handling after dropping temp-file handling
 
 ### Fixed
 

diff --git a/src/Util/PHP/AbstractPhpProcess.php b/src/Util/PHP/AbstractPhpProcess.php
@@ -52,10 +52,6 @@ abstract class AbstractPhpProcess
 
     public static function factory(): self
     {
-        if (PHP_OS_FAMILY === 'Windows') {
-            return new WindowsPhpProcess;
-        }
-
         return new DefaultPhpProcess;
     }
 

diff --git a/src/Util/PHP/DefaultPhpProcess.php b/src/Util/PHP/DefaultPhpProcess.php
@@ -40,7 +40,7 @@ class DefaultPhpProcess extends AbstractPhpProcess
      */
     public function runJob(string $job, array $settings = []): array
     {
-        if ($this->stdin || $this->useTemporaryFile()) {
+        if ($this->stdin) {
             if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'phpunit_')) ||
                 file_put_contents($this->tempFile, $job) === false) {
                 throw new PhpProcessException(
@@ -143,9 +143,4 @@ protected function cleanup(): void
             unlink($this->tempFile);
         }
     }
-
-    protected function useTemporaryFile(): bool
-    {
-        return false;
-    }
 }
diff --git a/src/Util/PHP/WindowsPhpProcess.php b/src/Util/PHP/WindowsPhpProcess.php