Skip to content

Commit d704e30

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: Mitigate PHPUnit deprecations [TwigBundle] Add support for resetting globals between HTTP requests Mitigate PHPUnit deprecations [Cache] Fix compatibility with Redis 6.1.0 pre-releases [Validator] Add Catalan and Spanish translation for `Week` constraint Don't use is_resource() on non-streams [Ldap] Fix extension deprecation
2 parents 82d962e + 8c567a2 commit d704e30

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Process.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ public function start(?callable $callback = null, array $env = []): void
372372
restore_error_handler();
373373
}
374374

375-
if (!\is_resource($process)) {
375+
if (!$process) {
376376
throw new ProcessStartFailedException($this, $lastError);
377377
}
378378
$this->process = $process;
@@ -1434,8 +1434,9 @@ private function readPipes(bool $blocking, bool $close): void
14341434
private function close(): int
14351435
{
14361436
$this->processPipes->close();
1437-
if (\is_resource($this->process)) {
1437+
if ($this->process) {
14381438
proc_close($this->process);
1439+
$this->process = null;
14391440
}
14401441
$this->exitcode = $this->processInformation['exitcode'];
14411442
$this->status = self::STATUS_TERMINATED;

0 commit comments

Comments
 (0)