From d6be2a693b6c35e2294d839335f1908b4339df12 Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Fri, 22 Jan 2016 14:27:08 +0100 Subject: [PATCH] switch to array-replace-recursive --- src/Composer/Util/RemoteFilesystem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php index f501d52b3..9a8a25d81 100644 --- a/src/Composer/Util/RemoteFilesystem.php +++ b/src/Composer/Util/RemoteFilesystem.php @@ -629,7 +629,7 @@ class RemoteFilesystem ); if (isset($options['ssl'])) { - $defaults['ssl'] = array_merge_recursive($defaults['ssl'], $options['ssl']); + $defaults['ssl'] = array_replace_recursive($defaults['ssl'], $options['ssl']); } /**