public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-10 00:53:06 +00:00
Code Activity

Merge remote-tracking branch 'composer/master' into gitlab

Browse source 
Conflicts:
	doc/04-schema.md
	src/Composer/Util/RemoteFilesystem.php
This commit is contained in:
Jérôme Tamarelle 2015-11-14 14:13:39 +01:00
commit ac68a721f4
262 changed files with 10060 additions and 7682 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Composer/IO/BaseIO.php
View file

@ -13,6 +13,7 @@
namespace Composer\IO;
use Composer\Config;
use Composer\Util\ProcessExecutor;
abstract class BaseIO implements IOInterface
{
@ -81,5 +82,8 @@ abstract class BaseIO implements IOInterface
$this->setAuthentication($domain, $cred['username'], $cred['password']);
}
}
// setup process timeout
ProcessExecutor::setTimeout((int) $config->get('process-timeout'));
}
}