Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/process/Pipes/UnixPipes.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
| author | Chris Cannam |
|---|---|
| date | Thu, 28 Feb 2019 13:21:36 +0000 |
| parents | c2387f117808 |
| children |
line wrap: on
line diff
--- a/vendor/symfony/process/Pipes/UnixPipes.php Tue Jul 10 15:07:59 2018 +0100 +++ b/vendor/symfony/process/Pipes/UnixPipes.php Thu Feb 28 13:21:36 2019 +0000 @@ -48,34 +48,34 @@ if (!$this->haveReadSupport) { $nullstream = fopen('/dev/null', 'c'); - return array( - array('pipe', 'r'), + return [ + ['pipe', 'r'], $nullstream, $nullstream, - ); + ]; } if ($this->ttyMode) { - return array( - array('file', '/dev/tty', 'r'), - array('file', '/dev/tty', 'w'), - array('file', '/dev/tty', 'w'), - ); + return [ + ['file', '/dev/tty', 'r'], + ['file', '/dev/tty', 'w'], + ['file', '/dev/tty', 'w'], + ]; } if ($this->ptyMode && Process::isPtySupported()) { - return array( - array('pty'), - array('pty'), - array('pty'), - ); + return [ + ['pty'], + ['pty'], + ['pty'], + ]; } - return array( - array('pipe', 'r'), - array('pipe', 'w'), // stdout - array('pipe', 'w'), // stderr - ); + return [ + ['pipe', 'r'], + ['pipe', 'w'], // stdout + ['pipe', 'w'], // stderr + ]; } /** @@ -83,7 +83,7 @@ */ public function getFiles() { - return array(); + return []; } /** @@ -94,18 +94,18 @@ $this->unblock(); $w = $this->write(); - $read = $e = array(); + $read = $e = []; $r = $this->pipes; unset($r[0]); // let's have a look if something changed in streams - set_error_handler(array($this, 'handleError')); + set_error_handler([$this, 'handleError']); if (($r || $w) && false === stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) { restore_error_handler(); // if a system call has been interrupted, forget about it, let's try again // otherwise, an error occurred, let's reset pipes if (!$this->hasSystemCallBeenInterrupted()) { - $this->pipes = array(); + $this->pipes = []; } return $read;
