Skip to content

Commit 097d217

Browse files
Merge branch '10.5' into 11.0
2 parents b7fda56 + 9f35e8a commit 097d217

File tree

4 files changed

+2
-33
lines changed

4 files changed

+2
-33
lines changed

ChangeLog-11.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 11.0 release series are documented in this fi
77
### Changed
88

99
* [#5766](https://github.com/sebastianbergmann/phpunit/pull/5766): Do not use a shell in `proc_open()` if not really needed
10+
* [#5772](https://github.com/sebastianbergmann/phpunit/pull/5772): Cleanup process handling after dropping temp-file handling
1011

1112
### Fixed
1213

src/Util/PHP/AbstractPhpProcess.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ abstract class AbstractPhpProcess
5252

5353
public static function factory(): self
5454
{
55-
if (PHP_OS_FAMILY === 'Windows') {
56-
return new WindowsPhpProcess;
57-
}
58-
5955
return new DefaultPhpProcess;
6056
}
6157

src/Util/PHP/DefaultPhpProcess.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class DefaultPhpProcess extends AbstractPhpProcess
4040
*/
4141
public function runJob(string $job, array $settings = []): array
4242
{
43-
if ($this->stdin || $this->useTemporaryFile()) {
43+
if ($this->stdin) {
4444
if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'phpunit_')) ||
4545
file_put_contents($this->tempFile, $job) === false) {
4646
throw new PhpProcessException(
@@ -143,9 +143,4 @@ protected function cleanup(): void
143143
unlink($this->tempFile);
144144
}
145145
}
146-
147-
protected function useTemporaryFile(): bool
148-
{
149-
return false;
150-
}
151146
}

src/Util/PHP/WindowsPhpProcess.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)