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

add missing array-replace-recursive

pull/4805/head
Rob Bast 2016-01-22 14:29:29 +01:00
parent d6be2a693b
commit 5b85ee409c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/Factory.php
View File

@ -595,6 +595,7 @@ class Factory
if ($config && $config->get('capath')) { if ($config && $config->get('capath')) {
$remoteFilesystemOptions['ssl']['capath'] = $config->get('capath'); $remoteFilesystemOptions['ssl']['capath'] = $config->get('capath');
} }
$remoteFilesystemOptions = array_replace_recursive($remoteFilesystemOptions, $options);
} }
try { try {
$remoteFilesystem = new RemoteFilesystem($io, $config, $remoteFilesystemOptions, $disableTls); $remoteFilesystem = new RemoteFilesystem($io, $config, $remoteFilesystemOptions, $disableTls);