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

wrong array

pull/4805/head
Rob Bast 2016-01-20 21:27:26 +01:00
parent 008cce8d85
commit b95b0c2ab6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Util/RemoteFilesystem.php
View File

@ -642,12 +642,12 @@ class RemoteFilesystem
fclose($target); fclose($target);
unset($source, $target); unset($source, $target);
$options['ssl']['cafile'] = $targetPath; $defaults['ssl']['cafile'] = $targetPath;
} else { } else {
if (is_dir($result)) { if (is_dir($result)) {
$options['ssl']['capath'] = $result; $defaults['ssl']['capath'] = $result;
} elseif ($result) { } elseif ($result) {
$options['ssl']['cafile'] = $result; $defaults['ssl']['cafile'] = $result;
} }
} }
} else { } else {
@ -655,11 +655,11 @@ class RemoteFilesystem
} }
} }
if (isset($options['ssl']['cafile']) && (!is_readable($options['ssl']['cafile']) || !$this->validateCaFile($options['ssl']['cafile']))) { if (isset($defaults['ssl']['cafile']) && (!is_readable($defaults['ssl']['cafile']) || !$this->validateCaFile($defaults['ssl']['cafile']))) {
throw new TransportException('The configured cafile was not valid or could not be read.'); throw new TransportException('The configured cafile was not valid or could not be read.');
} }
if (isset($options['ssl']['capath']) && (!is_dir($options['ssl']['capath']) || !is_readable($options['ssl']['capath']))) { if (isset($defaults['ssl']['capath']) && (!is_dir($defaults['ssl']['capath']) || !is_readable($defaults['ssl']['capath']))) {
throw new TransportException('The configured capath was not valid or could not be read.'); throw new TransportException('The configured capath was not valid or could not be read.');
} }