Added support for configuring runCommand's timeout argument in Composer InstallTask

This commit is contained in:
Dave Clarke 2017-03-08 15:35:36 -06:00
parent 2a9134cc35
commit 5f0b5d86c7

View file

@ -36,7 +36,7 @@ class InstallTask extends AbstractTask
$cmd = sprintf('%s install %s', $options['path'], $options['flags']); $cmd = sprintf('%s install %s', $options['path'], $options['flags']);
/** @var Process $process */ /** @var Process $process */
$process = $this->runtime->runCommand(trim($cmd)); $process = $this->runtime->runCommand(trim($cmd), $options['timeout']);
return $process->isSuccessful(); return $process->isSuccessful();
} }
@ -44,7 +44,7 @@ class InstallTask extends AbstractTask
protected function getOptions() protected function getOptions()
{ {
$options = array_merge( $options = array_merge(
['path' => 'composer', 'flags' => '--optimize-autoloader'], ['path' => 'composer', 'flags' => '--optimize-autoloader', 'timeout' => 120],
$this->runtime->getMergedOption('composer'), $this->runtime->getMergedOption('composer'),
$this->options $this->options
); );