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

Fixes from functional testing (need to automate this stuff!)

pull/2745/head
Pádraic Brady 2014-02-24 20:59:04 +00:00
parent 600b6c8cb3
commit 83d4e3a940
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Command/SelfUpdateCommand.php
View File

@ -67,7 +67,7 @@ EOT
$baseUrl = 'http://' . self::HOMEPAGE; $baseUrl = 'http://' . self::HOMEPAGE;
$disableTls = true; $disableTls = true;
} elseif (!extension_loaded('openssl')) { } elseif (!extension_loaded('openssl')) {
$output->writeln('<error>The openssl extension is required for SSL/TLS protection.</error>'); $output->writeln('<error>The openssl extension is required for SSL/TLS protection but is not available.</error>');
$output->writeln('<error>You can disable this error, at your own risk, by enabling the \'disable-tls\' option.</error>'); $output->writeln('<error>You can disable this error, at your own risk, by enabling the \'disable-tls\' option.</error>');
return 1; return 1;
} else { } else {
@ -79,8 +79,8 @@ EOT
if (!is_null($config->get('cafile'))) { if (!is_null($config->get('cafile'))) {
$remoteFilesystemOptions = array('ssl'=>array('cafile'=>$config->get('cafile'))); $remoteFilesystemOptions = array('ssl'=>array('cafile'=>$config->get('cafile')));
} }
if (!is_null($input->get('cafile'))) { if (!is_null($input->getOption('cafile'))) {
$remoteFilesystemOptions = array('ssl'=>array('cafile'=>$input->get('cafile'))); $remoteFilesystemOptions = array('ssl'=>array('cafile'=>$input->getOption('cafile')));
} }
} }
try { try {

4
src/Composer/Factory.php
View File

@ -208,8 +208,8 @@ class Factory
$rfsOptions = array(); $rfsOptions = array();
if ($disableTls === false) { if ($disableTls === false) {
if (!is_null($input->get('cafile'))) { if (!is_null($input->getOption('cafile'))) {
$rfsOptions = array('ssl'=>array('cafile'=>$input->get('cafile'))); $rfsOptions = array('ssl'=>array('cafile'=>$input->getOption('cafile')));
} }
} }
$rfs = new RemoteFilesystem($io, $rfsOptions, $disableTls); $rfs = new RemoteFilesystem($io, $rfsOptions, $disableTls);