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

make sure passed options are merged into defaults before checking

pull/4805/head
Rob Bast 2016-01-20 21:35:06 +01:00
parent 94947ee772
commit f79255df29
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -623,6 +623,10 @@ class RemoteFilesystem
) )
); );
if (isset($options['ssl'])) {
$defaults['ssl'] = array_merge_recursive($defaults['ssl'], $options['ssl']);
}
/** /**
* Attempt to find a local cafile or throw an exception if none pre-set * Attempt to find a local cafile or throw an exception if none pre-set
* The user may go download one if this occurs. * The user may go download one if this occurs.