public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Enable https for packagist when possible

pull/1205/head
Jordi Boggiano 2012-10-11 20:54:59 +02:00
parent 8f12516222
commit fb296972ef
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Config.php
View File

@ -28,7 +28,7 @@ class Config
public static $defaultRepositories = array( public static $defaultRepositories = array(
'packagist' => array( 'packagist' => array(
'type' => 'composer', 'type' => 'composer',
'url' => 'http://packagist.org', 'url' => 'https?://packagist.org',
) )
); );

7
src/Composer/Repository/ComposerRepository.php
View File

@ -38,11 +38,16 @@ class ComposerRepository extends ArrayRepository implements NotifiableRepository
public function __construct(array $repoConfig, IOInterface $io, Config $config) public function __construct(array $repoConfig, IOInterface $io, Config $config)
{ {
if (!preg_match('{^[\w.]+://}', $repoConfig['url'])) { if (!preg_match('{^[\w.]+\??://}', $repoConfig['url'])) {
// assume http as the default protocol // assume http as the default protocol
$repoConfig['url'] = 'http://'.$repoConfig['url']; $repoConfig['url'] = 'http://'.$repoConfig['url'];
} }
$repoConfig['url'] = rtrim($repoConfig['url'], '/'); $repoConfig['url'] = rtrim($repoConfig['url'], '/');
if ('https?' === substr($repoConfig['url'], 0, 6)) {
$repoConfig['url'] = (extension_loaded('openssl') ? 'https' : 'http') . substr($repoConfig['url'], 6);
}
if (function_exists('filter_var') && version_compare(PHP_VERSION, '5.3.3', '>=') && !filter_var($repoConfig['url'], FILTER_VALIDATE_URL)) { if (function_exists('filter_var') && version_compare(PHP_VERSION, '5.3.3', '>=') && !filter_var($repoConfig['url'], FILTER_VALIDATE_URL)) {
throw new \UnexpectedValueException('Invalid url given for Composer repository: '.$repoConfig['url']); throw new \UnexpectedValueException('Invalid url given for Composer repository: '.$repoConfig['url']);
} }