Skip to content

Commit e89969c

Browse files
Merge branch '3.4' into 4.3
* 3.4: (21 commits) [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations [Routing] Fix return type declarations ...
2 parents 1931081 + d822cb6 commit e89969c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Process.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class Process implements \IteratorAggregate
6969
private $status = self::STATUS_READY;
7070
private $incrementalOutputOffset = 0;
7171
private $incrementalErrorOutputOffset = 0;
72-
private $tty;
72+
private $tty = false;
7373
private $pty;
7474

7575
private $useFileHandles = false;
@@ -892,7 +892,7 @@ public function getStatus()
892892
* @param int|float $timeout The timeout in seconds
893893
* @param int $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL (9)
894894
*
895-
* @return int The exit-code of the process
895+
* @return int|null The exit-code of the process or null if it's not running
896896
*/
897897
public function stop($timeout = 10, $signal = null)
898898
{

0 commit comments

Comments
 (0)