hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-11-04 00:50:18 +01:00
Code Issues Releases Wiki Activity

Merge pull request #364 from Dgc2002/composer-install-timeout

Browse Source 
[FEATURE] Added support for specifying task timeout in composer install task
This commit is contained in:
Andrés Montañez 2017-04-14 15:07:51 -03:00 committed by GitHub
commit 49b96e00a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Task/BuiltIn/Composer/InstallTask.php
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
); );