Skip to content

Commit 3e36da1

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: Mitigate PHPUnit deprecations [TwigBundle] Add support for resetting globals between HTTP requests [Validator] Add Catalan and Spanish translation for `Week` constraint Don't use is_resource() on non-streams [Ldap] Fix extension deprecation
2 parents 4268688 + 7a7ce2c commit 3e36da1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Terminal.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ private static function readFromProcess(string|array $command): ?string
217217

218218
$cp = \function_exists('sapi_windows_cp_set') ? sapi_windows_cp_get() : 0;
219219

220-
$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
221-
if (!\is_resource($process)) {
220+
if (!$process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true])) {
222221
return null;
223222
}
224223

0 commit comments

Comments
 (0)