Skip to content

Commit bae6f53

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [HttpClient] Don't ignore errors from curl_multi_exec() [HttpClient] Double check if handle is complete CI for macOS [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass [Process] fixed uppercase ARGC and ARGV should also be skipped [FrameworkBundle] Fix cache pool configuration with one adapter and one provider Missing translations for Belarusian (be) #41032
2 parents 75c91d6 + c1d5c35 commit bae6f53

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Process.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public function start(callable $callback = null, array $env = [])
338338

339339
$envPairs = [];
340340
foreach ($env as $k => $v) {
341-
if (false !== $v && 'argc' !== $k && 'argv' !== $k) {
341+
if (false !== $v && false === \in_array($k, ['argc', 'argv', 'ARGC', 'ARGV'], true)) {
342342
$envPairs[] = $k.'='.$v;
343343
}
344344
}
@@ -971,8 +971,6 @@ public function addErrorOutput(string $line)
971971

972972
/**
973973
* Gets the last output time in seconds.
974-
*
975-
* @return float|null The last output time in seconds or null if it isn't started
976974
*/
977975
public function getLastOutputTime(): ?float
978976
{
@@ -1491,8 +1489,6 @@ private function resetProcessData()
14911489
* @param int $signal A valid POSIX signal (see https://php.net/pcntl.constants)
14921490
* @param bool $throwException Whether to throw exception in case signal failed
14931491
*
1494-
* @return bool True if the signal was sent successfully, false otherwise
1495-
*
14961492
* @throws LogicException In case the process is not running
14971493
* @throws RuntimeException In case --enable-sigchild is activated and the process can't be killed
14981494
* @throws RuntimeException In case of failure

0 commit comments

Comments
 (0)